Merge pull request #81 from JaKooLit/Development

Development

1 files changed, 20 insertions, 9 deletions

diff --git a/copy.sh b/copy.sh
index 5db1ea5a..453443f6 100755
--- a/copy.sh
+++ b/copy.sh
@@ -2,6 +2,8 @@
 
 ### https://github.com/JaKooLit/JaKooLit
 
+wallpaper=$HOME/Pictures/wallpapers/CuteCat.png
+
 # Check if running as root. If root, script will exit
 if [[ $EUID -eq 0 ]]; then
     echo "This script should not be executed as root! Exiting......."
@@ -97,8 +99,13 @@ if [ "$confirm" = "y" ]; then
   mv temp.conf config/hypr/configs/Settings.conf
 else
   # If the detected layout is not correct, prompt the user to enter the correct layout
-  printf "${YELLOW} Ensure to type in the proper keyboard layout else Hyprland will crash and might not start!!!\n\n"
-  printf "${WARN} - Sample Keyboard layouts are us, kr, es, gb, de, pl, etc.\n\n"
+	printf "\n%.0s" {1..2}
+	echo "$(tput bold)$(tput setaf 3)ATTENTION!!!! VERY IMPORTANT!!!! $(tput sgr0)" 
+	echo "$(tput bold)$(tput setaf 7)Setting a wrong value here will result in Hyprland not starting $(tput sgr0)"
+	echo "$(tput bold)$(tput setaf 7)If you are not sure, keep it in us layout. You can change later on! $(tput sgr0)"
+	echo "$(tput bold)$(tput setaf 7)You can also set more than 2 layouts!$(tput sgr0)"
+	echo "$(tput bold)$(tput setaf 7)ie: us,kr,es $(tput sgr0)"
+	printf "\n%.0s" {1..2}
   read -p "${CAT} - Please enter the correct keyboard layout: " new_layout
   # Update the 'kb_layout=' line with the correct layout in the file
   awk -v new_layout="$new_layout" '/kb_layout/ {$0 = "  kb_layout=" new_layout} 1' config/hypr/configs/Settings.conf > temp.conf
@@ -162,6 +169,8 @@ printf "${NOTE} - copying dotfiles\n"
     fi
   done
 
+printf "\n%.0s" {1..2}
+
 # Copying config files
 printf " Copying config files...\n"
 mkdir -p ~/.config
@@ -188,19 +197,22 @@ while true; do
     case $WALL in
         [Yy])
             echo "${NOTE} Downloading additional wallpapers..."
-            if git clone https://github.com/JaKooLit/Wallpaper-Bank.git 2>&1 | tee -a "$LOG"; then
-                if cp -R Wallpaper-Bank/wallpapers/* ~/Pictures/wallpapers/; then 2>&1 | tee -a "$LOG"
+            if git clone --progress "https://github.com/JaKooLit/Wallpaper-Bank.git" 2>&1 | tee -a "$LOG"; then
+                echo "${NOTE} Wallpapers downloaded successfully."
+
+                if cp -R Wallpaper-Bank/wallpapers/* ~/Pictures/wallpapers/ 2>&1 | tee -a "$LOG"; then
+                    echo "${NOTE} Wallpapers copied successfully."
                     rm -rf Wallpaper-Bank 2>&1 | tee -a "$LOG" # Remove cloned repository after copying wallpapers
                     break
                 else
-                    echo "${ERROR} Copying wallpapers failed" 2>&1 | tee -a "$LOG"
+                    echo "${ERROR} Copying wallpapers failed" >&2 | tee -a "$LOG"
                 fi
             else
-                echo "${ERROR} Downloading additional wallpapers failed" 2>&1 | tee -a "$LOG"
+                echo "${ERROR} Downloading additional wallpapers failed" >&2 | tee -a "$LOG"
             fi
             ;;
         [Nn])
-            echo "You chose not to download additional wallpapers." 2>&1 | tee -a "$LOG"
+            echo "You chose not to download additional wallpapers." >&2 | tee -a "$LOG"
             break
             ;;
         *)
@@ -222,12 +234,11 @@ else
     rm -r "$HOME/.config/waybar/configs/[TOP] Default" "$HOME/.config/waybar/configs/[BOT] Default" 2>&1 | tee -a "$LOG"
 fi
 
-
 # symlinks for waybar style
 ln -sf "$HOME/.config/waybar/style/[Pywal] Chroma Fusion.css" "$HOME/.config/waybar/style.css" && \
 
 # initialize pywal to avoid config error on hyprland
-wal -i ~/Pictures/wallpapers/anime-girl-abyss.png 2>&1 | tee -a "$LOG"
+wal -i $wallpaper -s -t 2>&1 | tee -a "$LOG"
 
 #initial symlink for Pywal Dark and Light for Rofi Themes
 ln -sf "$HOME/.cache/wal/colors-rofi-dark.rasi" "$HOME/.config/rofi/pywal-color/pywal-theme.rasi"