From e9727461b0b79536d12b88ea0133031ac9f687d2 Mon Sep 17 00:00:00 2001 From: JaKooLit Date: Tue, 25 Mar 2025 00:58:25 +0900 Subject: [PATCH] install.sh updated to NOT exit if user choose N on the last part. Removed auto-clone instruction for Fish as it creates a big issue --- README.md | 7 +++---- install.sh | 39 +++++++++++++++++++++------------------ 2 files changed, 24 insertions(+), 22 deletions(-) diff --git a/README.md b/README.md index 4103fc8..5009867 100644 --- a/README.md +++ b/README.md @@ -121,15 +121,14 @@ sudo apt install --no-install-recommends -y sddm > If you have nvidia, by default debian is installing nouveau or open-source nvidia driver. If you want to keep the default nvidia driver installed by Debian, Dont select Nvidia in the options. ## ✨ Auto clone and install +> [!CAUTION] +> If you are using FISH SHELL, DO NOT use this function. Clone and ran install.sh instead + - you can use this command to automatically clone the installer and ran the script for you - NOTE: `curl` package is required before running this command ```bash sh <(curl -L https://raw.githubusercontent.com/JaKooLit/Debian-Hyprland/main/auto-install.sh) ``` -- if you are using say fish or a non-POSIX compliant -```bash -curl -sL https://raw.githubusercontent.com/JaKooLit/Debian-Hyprland/main/auto-install.sh | bash -``` ## ✨ to use this script > clone this repo (latest commit only) by using git. Change directory, make executable and run the script diff --git a/install.sh b/install.sh index 5b78f6e..9b46c76 100755 --- a/install.sh +++ b/install.sh @@ -431,36 +431,39 @@ printf "\n%.0s" {1..1} # Check if either hyprland or hyprland-git is installed if dpkg -l | grep -qw hyprland; then - printf "\n${OK} Hyprland is installed. However, some essential packages may not be installed. Please see above!" + printf "\n ${OK} 👌 Hyprland is installed. However, some essential packages may not be installed. Please see above!" printf "\n${CAT} Ignore this message if it states ${YELLOW}All essential packages${RESET} are installed as per above\n" sleep 2 printf "\n%.0s" {1..2} - printf "${SKY_BLUE}Thank you${RESET} for using ${MAGENTA}KooL's Hyprland Dots${RESET}. ${YELLOW}Enjoy and Have a good day!${RESET}" + printf "${SKY_BLUE}Thank you${RESET} 🫰 for using 🇵🇭 ${MAGENTA}KooL's Hyprland Dots${RESET}. ${YELLOW}Enjoy and Have a good day!${RESET}" printf "\n%.0s" {1..2} printf "\n${NOTE} You can start Hyprland by typing ${SKY_BLUE}Hyprland${RESET} (IF SDDM is not installed) (note the capital H!).\n" printf "\n${NOTE} However, it is ${YELLOW}highly recommended to reboot${RESET} your system.\n\n" - read -rp "${CAT} Would you like to reboot now? (y/n): " HYP + while true; do + echo -n "${CAT} Would you like to reboot now? (y/n): " + read HYP + HYP=$(echo "$HYP" | tr '[:upper:]' '[:lower:]') - HYP=$(echo "$HYP" | tr '[:upper:]' '[:lower:]') - - if [[ "$HYP" == "y" || "$HYP" == "yes" ]]; then - echo "${INFO} Rebooting now..." - systemctl reboot - elif [[ "$HYP" == "n" || "$HYP" == "no" ]]; then - echo "${OK} You choose NOT to reboot" - printf "\n%.0s" {1..1} - # Check if NVIDIA GPU is present - if lspci | grep -i "nvidia" &> /dev/null; then - echo "${INFO} HOWEVER ${YELLOW}NVIDIA GPU${RESET} detected. Reminder that you must REBOOT your SYSTEM..." + if [[ "$HYP" == "y" || "$HYP" == "yes" ]]; then + echo "${INFO} Rebooting now..." + systemctl reboot + break + elif [[ "$HYP" == "n" || "$HYP" == "no" ]]; then + echo "👌 ${OK} You chose NOT to reboot" printf "\n%.0s" {1..1} + # Check if NVIDIA GPU is present + if lspci | grep -i "nvidia" &> /dev/null; then + echo "${INFO} HOWEVER ${YELLOW}NVIDIA GPU${RESET} detected. Reminder that you must REBOOT your SYSTEM..." + printf "\n%.0s" {1..1} + fi + break + else + echo "${WARN} Invalid response. Please answer with 'y' or 'n'." fi - else - echo "${WARN} Invalid response. Please answer with 'y' or 'n'. Exiting." - exit 1 - fi + done else # Print error message if neither package is installed printf "\n${WARN} Hyprland is NOT installed. Please check 00_CHECK-time_installed.log and other files in the Install-Logs/ directory..."