Merge pull request #198 from JaKooLit/main

main to development

CHANGELOGS.md

@@ -1,5 +1,8 @@
 ## CHANGELOGS
 
+## 20 March 2025
+- added findutils as dependencies
+
 ## 11 March 2025
 - Added uninstall script
 - forked AGS v1 into JakooLit repo. This is just incase Aylur decide to take down v1

CONTRIBUTING.md

@@ -1,6 +1,6 @@
-# Contributing to Community Standards
+# Contributing to KooL Hyprland Projects
 
-Thank you for your interest in contributing to Community Standards! We welcome any contributions, including bug fixes, feature enhancements, documentation improvements, and other general improvements.
+Thank you for your interest in contributing to KooL Hyprland Projects! We welcome any contributions, including bug fixes, feature enhancements, documentation improvements, and other general improvements.
 
 ## Getting Started
 
@@ -55,10 +55,9 @@ Thank you for your interest in contributing to Community Standards! We welcome a
 - Make sure all tests pass or fully tested before submitting your changes.
 - Keep your pull request focused and avoid including unrelated changes.
 - Remember to follow the following files before submitting your changes.
-  - [bug_report.md](https://github.com/JaKooLit/Debian-Hyprland/blob/main/.github/ISSUE_TEMPLATE/bug_report.md) - Use this template to create a report to help us improve.
+  - [bug.yml](https://github.com/JaKooLit/Debian-Hyprland/blob/main/.github/ISSUE_TEMPLATE/bug.yml) - Use this template to create a report to help us improve.
-  - [feature_request.md](https://github.com/JaKooLit/Debian-Hyprland/blob/main/.github/ISSUE_TEMPLATE/feature_request.md) - Use this template to suggest a feature for this project.
+  - [feature.yml](https://github.com/JaKooLit/Debian-Hyprland/blob/main/.github/ISSUE_TEMPLATE/feature.yml) - Use this template to suggest a feature for this project.
-  - [documentation_update.md](https://github.com/JaKooLit/Debian-Hyprland/blob/main/.github/ISSUE_TEMPLATE/documentation_update.md) - Use this template to propose a change to the documentation.
+  - [documentation-update.yml](https://github.com/JaKooLit/Debian-Hyprland/blob/main/.github/ISSUE_TEMPLATE/documentation-update.yml) - Use this template to propose a change to the documentation.
-  - [custom.md](https://github.com/JaKooLit/Debian-Hyprland/blob/main/.github/ISSUE_TEMPLATE/custom.md) - Use this template to submit a custom issue.
   - [PULL_REQUEST_TEMPLATE.md](https://github.com/JaKooLit/Debian-Hyprland/blob/main/.github/PULL_REQUEST_TEMPLATE.md) - Use this template to submit a pull request.
   - [COMMIT_MESSAGE_GUIDELINES.md](https://github.com/JaKooLit/Debian-Hyprland/blob/main/COMMIT_MESSAGE_GUIDELINES.md) - Read this file to learn about the commit message guidelines.
   - [CONTRIBUTING.md](https://github.com/JaKooLit/Debian-Hyprland/blob/main/CONTRIBUTING.md) - Read this file to learn about the contributing guidelines.

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
@@ -275,10 +274,11 @@ cd ~/Debian-Hyprland
 - Feel free to copy, re-distribute, and use this script however you want. Would appreciate if you give me some loves by crediting my work :)
 
 
-#### ⏩ Contributing
+#### ✍️ Contributing
 - As stated above, these script does not contain actual config files. These are only the installer of packages
-- The development branch of this script is pulling the latest "stable" releases of the Hyprland-Dotfiles.
+- If you want to contribute and/or test the Hyprland-Dotfiles (development branch), [`Hyprland-Dots-Development`](https://github.com/JaKooLit/Hyprland-Dots/tree/development)
-- If you want to contribute and/or test the Hyprland-Dotfiles (development branch), [`Hyprland-Dots-Development`](https://github.com/JaKooLit/Hyprland-Dots/tree/development) 
+- Want to contribute on KooL-Hyprland-Dots Click [`HERE`](https://github.com/JaKooLit/Hyprland-Dots/blob/main/CONTRIBUTING.md) for a guide how to contribute
+- Want to contribute on This Installer? Click [`HERE`](https://github.com/JaKooLit/Debian-Hyprland/blob/main/CONTRIBUTING.md) for a guide how to contribute
 
 
 #### 👍👍👍 Thanks and Credits!

install-scripts/00-dependencies.sh

@@ -10,6 +10,7 @@ dependencies=(
     cmake
     cmake-extras
     curl
+    findutils
     gawk
     gettext
     git

install-scripts/zsh.sh

@@ -76,18 +76,20 @@ if command -v zsh >/dev/null; then
   cp -r 'assets/.zprofile' ~/
 
   # Check if the current shell is zsh
-  if [[ "$SHELL" != *"zsh"* ]]; then
+  current_shell=$(basename "$SHELL")
+  if [ "$current_shell" != "zsh" ]; then
     printf "${NOTE} Changing default shell to ${MAGENTA}zsh${RESET}..."
     printf "\n%.0s" {1..2}
 
-    while ! chsh -s $(which zsh); do
+    # Loop to ensure the chsh command succeeds
+    while ! chsh -s "$(command -v zsh)"; do
       echo "${ERROR} Authentication failed. Please enter the correct password." 2>&1 | tee -a "$LOG"
       sleep 1
     done
 
     printf "${INFO} Shell changed successfully to ${MAGENTA}zsh${RESET}" 2>&1 | tee -a "$LOG"
   else
-    echo "${NOTE}Your shell is already set to ${MAGENTA}zsh${RESET}."
+    echo "${NOTE} Your shell is already set to ${MAGENTA}zsh${RESET}."
   fi
 
 fi

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..."
-    if [[ "$HYP" == "y" || "$HYP" == "yes" ]]; then
+            systemctl reboot 
-        echo "${INFO} Rebooting now..."
+            break
-        systemctl reboot 
+        elif [[ "$HYP" == "n" || "$HYP" == "no" ]]; then
-    elif [[ "$HYP" == "n" || "$HYP" == "no" ]]; then
+            echo "👌 ${OK} You chose NOT to reboot"
-        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..."
             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
+    done
-        echo "${WARN} Invalid response. Please answer with 'y' or 'n'. Exiting."
-        exit 1
-    fi
 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..."