Merge pull request #287 from JaKooLit/main

main to development

CHANGELOGS.md

@@ -2,6 +2,7 @@
 
 ## 20 March 2025
 - adjusted hyprland installation script. This is great for those who are using -git packages
+- added findutils as dependencies
 
 ## 11 March 2025
 - Added uninstall script

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/Arch-Hyprland/blob/main/.github/ISSUE_TEMPLATE/bug_report.md) - Use this template to create a report to help us improve.
-  - [feature_request.md](https://github.com/JaKooLit/Arch-Hyprland/blob/main/.github/ISSUE_TEMPLATE/feature_request.md) - Use this template to suggest a feature for this project.
-  - [documentation_update.md](https://github.com/JaKooLit/Arch-Hyprland/blob/main/.github/ISSUE_TEMPLATE/documentation_update.md) - Use this template to propose a change to the documentation.
-  - [custom.md](https://github.com/JaKooLit/Arch-Hyprland/blob/main/.github/ISSUE_TEMPLATE/custom.md) - Use this template to submit a custom issue.
+  - [bug.yml](https://github.com/JaKooLit/Arch-Hyprland/blob/main/.github/ISSUE_TEMPLATE/bug.yml) - Use this template to create a report to help us improve.
+  - [feature.yml](https://github.com/JaKooLit/Arch-Hyprland/blob/main/.github/ISSUE_TEMPLATE/feature.yml) - Use this template to suggest a feature for this project.
+  - [documentation-update.yml](https://github.com/JaKooLit/Arch-Hyprland/blob/main/.github/ISSUE_TEMPLATE/documentation-update.yml) - Use this template to propose a change to the documentation.
   - [PULL_REQUEST_TEMPLATE.md](https://github.com/JaKooLit/Arch-Hyprland/blob/main/.github/PULL_REQUEST_TEMPLATE.md) - Use this template to submit a pull request.
   - [COMMIT_MESSAGE_GUIDELINES.md](https://github.com/JaKooLit/Arch-Hyprland/blob/main/COMMIT_MESSAGE_GUIDELINES.md) - Read this file to learn about the commit message guidelines.
   - [CONTRIBUTING.md](https://github.com/JaKooLit/Arch-Hyprland/blob/main/CONTRIBUTING.md) - Read this file to learn about the contributing guidelines.

README.md

@@ -101,16 +101,14 @@ https://github.com/user-attachments/assets/49bc12b2-abaf-45de-a21c-67aacd9bb872
 - After installation, check [`THIS`](https://github.com/JaKooLit/Hyprland-Dots/wiki/Notes_to_remember#--for-nvidia-gpu-users)
 
 ## ✨ 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/Arch-Hyprland/main/auto-install.sh)
 ```
-- if you are using like fish or a non-POSIX compliant terminal
-```bash
-curl -sL https://raw.githubusercontent.com/JaKooLit/Arch-Hyprland/main/auto-install.sh | bash
-```
-
 
 ## ✨ to use this script
 - clone this repo (latest commit only) to reduce file size download by using git. Change directory, make executable and run the script
@@ -218,11 +216,11 @@ env = WLR_RENDERER_ALLOW_SOFTWARE,1
 
 
 
-#### ⏩ 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/Arch-Hyprland/blob/main/CONTRIBUTING.md) for a guide how to contribute
 
 #### 👍👍👍 Thanks and Credits!
 - [`Hyprland`](https://hyprland.org/) Of course to Hyprland and @vaxerski for this awesome Dynamic Tiling Manager.

install-scripts/00-base.sh

@@ -5,6 +5,7 @@
 base=( 
   base-devel
   archlinux-keyring
+  findutils
 )
 
 ## WARNING: DO NOT EDIT BEYOND THIS LINE IF YOU DON'T KNOW WHAT YOU ARE DOING! ##

install-scripts/01-hypr-pkgs.sh

@@ -75,8 +75,8 @@ hypr_package_2=(
 uninstall=(
   aylurs-gtk-shell
   dunst
-  mako
   cachyos-hyprland-settings
+  mako
   rofi
   wallust-git
   rofi-lbonn-wayland

install-scripts/ags.sh

@@ -68,9 +68,9 @@ printf "\n%.0s" {1..1}
 printf "${NOTE} Install and Compiling ${SKY_BLUE}Aylur's GTK shell $ags_tag${RESET}..\n"
 
 # Check if directory exists and remove it
-if [ -d "ags" ]; then
+if [ -d "ags_v1.9.0" ]; then
     printf "${NOTE} Removing existing ags directory...\n"
-    rm -rf "ags"
+    rm -rf "ags_v1.9.0"
 fi
 
 printf "\n%.0s" {1..1}

install-scripts/zsh.sh

@@ -80,19 +80,22 @@ 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
 
 # Installing core zsh packages

install.sh

@@ -473,25 +473,28 @@ if pacman -Q hyprland &> /dev/null || pacman -Q hyprland-git &> /dev/null; then
     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..."
@@ -499,4 +502,5 @@ else
     exit 1
 fi
 
+
 printf "\n%.0s" {1..2}