diff --git a/install.sh b/install.sh index 133d58c..de4bbe2 100755 --- a/install.sh +++ b/install.sh @@ -22,12 +22,14 @@ if [[ -t 1 ]] && [[ "${TERM:-dumb}" != "dumb" ]]; then GREEN='\033[0;32m' YELLOW='\033[1;33m' BLUE='\033[0;34m' + MINT='\033[38;2;154;184;124m' # Mint-Y green #9ab87c NC='\033[0m' else RED='' GREEN='' YELLOW='' BLUE='' + MINT='' NC='' fi @@ -47,11 +49,17 @@ trap cleanup EXIT # Print functions print_header() { - echo -e "${BLUE}" - echo "╔═══════════════════════════════════════════════════════════════╗" - echo "║ draphyOS Installer ║" - echo "╚═══════════════════════════════════════════════════════════════╝" + echo "" + echo -e "${MINT}" + echo " ██████╗ ██████╗ █████╗ ██████╗ ██╗ ██╗██╗ ██╗ ██████╗ ███████╗" + echo " ██╔══██╗██╔══██╗██╔══██╗██╔══██╗██║ ██║╚██╗ ██╔╝██╔═══██╗██╔════╝" + echo " ██║ ██║██████╔╝███████║██████╔╝███████║ ╚████╔╝ ██║ ██║███████╗" + echo " ██║ ██║██╔══██╗██╔══██║██╔═══╝ ██╔══██║ ╚██╔╝ ██║ ██║╚════██║" + echo " ██████╔╝██║ ██║██║ ██║██║ ██║ ██║ ██║ ╚██████╔╝███████║" + echo " ╚═════╝ ╚═╝ ╚═╝╚═╝ ╚═╝╚═╝ ╚═╝ ╚═╝ ╚═╝ ╚═════╝ ╚══════╝" echo -e "${NC}" + echo -e " Installer" + echo "" } print_step() { @@ -569,25 +577,25 @@ main() { create_marker echo "" - echo -e "${GREEN}╔═══════════════════════════════════════════════════════════════╗${NC}" - echo -e "${GREEN}║ draphyOS Installation Complete! ║${NC}" - echo -e "${GREEN}╚═══════════════════════════════════════════════════════════════╝${NC}" + echo -e "${MINT} ╔═══════════════════════════════════════════════════════════════╗${NC}" + echo -e "${MINT} ║ Installation Complete! ║${NC}" + echo -e "${MINT} ╚═══════════════════════════════════════════════════════════════╝${NC}" echo "" if [ -d "$BACKUP_DIR" ]; then - echo -e "Backup saved to: ${YELLOW}$BACKUP_DIR${NC}" + echo -e " Backup saved to: ${YELLOW}$BACKUP_DIR${NC}" echo "" fi - echo -e "${BLUE}Next steps:${NC}" - echo " 1. Log out and log back in (or reboot)" - echo " 2. Select 'i3' from the login screen" - echo " 3. Press Super+F1 for keybinding cheatsheet" + echo -e " ${MINT}Next steps:${NC}" + echo " 1. Log out and log back in (or reboot)" + echo " 2. Select 'i3' from the login screen" + echo " 3. Press Super+F1 for keybinding cheatsheet" echo "" - echo -e "Press ${GREEN}Super+d${NC} for app launcher" - echo -e "Press ${GREEN}Super+Return${NC} for terminal" + echo -e " Press ${MINT}Super+d${NC} for app launcher" + echo -e " Press ${MINT}Super+Return${NC} for terminal" echo "" - echo -e "${BLUE}Enjoy draphyOS!${NC}" + echo -e " ${MINT}Enjoy draphyOS!${NC}" echo "" - echo -e "Install log: ${YELLOW}$LOG_FILE${NC}" + echo -e " Install log: ${YELLOW}$LOG_FILE${NC}" } main "$@" diff --git a/uninstall.sh b/uninstall.sh index 34748b5..66f54c2 100755 --- a/uninstall.sh +++ b/uninstall.sh @@ -1,27 +1,50 @@ #!/bin/bash # +# ██████╗ ██████╗ █████╗ ██████╗ ██╗ ██╗██╗ ██╗ ██████╗ ███████╗ +# ██╔══██╗██╔══██╗██╔══██╗██╔══██╗██║ ██║╚██╗ ██╔╝██╔═══██╗██╔════╝ +# ██║ ██║██████╔╝███████║██████╔╝███████║ ╚████╔╝ ██║ ██║███████╗ +# ██║ ██║██╔══██╗██╔══██║██╔═══╝ ██╔══██║ ╚██╔╝ ██║ ██║╚════██║ +# ██████╔╝██║ ██║██║ ██║██║ ██║ ██║ ██║ ╚██████╔╝███████║ +# ╚═════╝ ╚═╝ ╚═╝╚═╝ ╚═╝╚═╝ ╚═╝ ╚═╝ ╚═╝ ╚═════╝ ╚══════╝ +# # draphyOS Uninstaller -# Complete revert of draphyOS installation +# https://github.com/draphy/draphyOS # set -e -# Colors -RED='\033[0;31m' -GREEN='\033[0;32m' -YELLOW='\033[1;33m' -BLUE='\033[0;34m' -NC='\033[0m' +# Colors (with fallback for non-color terminals) +if [[ -t 1 ]] && [[ "${TERM:-dumb}" != "dumb" ]]; then + RED='\033[0;31m' + GREEN='\033[0;32m' + YELLOW='\033[1;33m' + BLUE='\033[0;34m' + MINT='\033[38;2;154;184;124m' # Mint-Y green #9ab87c + NC='\033[0m' +else + RED='' + GREEN='' + YELLOW='' + BLUE='' + MINT='' + NC='' +fi INSTALL_DIR="$HOME/.draphyOS" MARKER_FILE="$HOME/.draphyOS-installed" print_header() { + echo "" echo -e "${RED}" - echo "╔═══════════════════════════════════════════════════════════════╗" - echo "║ draphyOS Uninstaller ║" - echo "╚═══════════════════════════════════════════════════════════════╝" + echo " ██████╗ ██████╗ █████╗ ██████╗ ██╗ ██╗██╗ ██╗ ██████╗ ███████╗" + echo " ██╔══██╗██╔══██╗██╔══██╗██╔══██╗██║ ██║╚██╗ ██╔╝██╔═══██╗██╔════╝" + echo " ██║ ██║██████╔╝███████║██████╔╝███████║ ╚████╔╝ ██║ ██║███████╗" + echo " ██║ ██║██╔══██╗██╔══██║██╔═══╝ ██╔══██║ ╚██╔╝ ██║ ██║╚════██║" + echo " ██████╔╝██║ ██║██║ ██║██║ ██║ ██║ ██║ ╚██████╔╝███████║" + echo " ╚═════╝ ╚═╝ ╚═╝╚═╝ ╚═╝╚═╝ ╚═╝ ╚═╝ ╚═╝ ╚═════╝ ╚══════╝" echo -e "${NC}" + echo -e " Uninstaller" + echo "" } print_step() { @@ -276,14 +299,14 @@ main() { remove_install_dir echo "" - echo -e "${GREEN}╔═══════════════════════════════════════════════════════════════╗${NC}" - echo -e "${GREEN}║ draphyOS Uninstallation Complete! ║${NC}" - echo -e "${GREEN}╚═══════════════════════════════════════════════════════════════╝${NC}" + echo -e "${MINT} ╔═══════════════════════════════════════════════════════════════╗${NC}" + echo -e "${MINT} ║ Uninstallation Complete! ║${NC}" + echo -e "${MINT} ╚═══════════════════════════════════════════════════════════════╝${NC}" echo "" - echo -e "${YELLOW}Please log out and back in for all changes to take effect.${NC}" + echo -e " ${YELLOW}Please log out and back in for all changes to take effect.${NC}" echo "" - echo "If you restored a backup, your previous configs are now active." - echo "If not, you may need to reconfigure your desktop environment." + echo " If you restored a backup, your previous configs are now active." + echo " If not, you may need to reconfigure your desktop environment." echo "" }