diff --git a/install-scripts/thunar.sh b/install-scripts/thunar.sh index 29929c1..293fb16 100644 --- a/install-scripts/thunar.sh +++ b/install-scripts/thunar.sh @@ -73,7 +73,9 @@ printf "${NOTE} Installing Thunar Packages...\n" echo -e "${NOTE} Backed up $DIR1 to $DIRPATH-back-up." fi done - cp -r assets/xfce4 ~/.config/ && { echo "Copy xfce4 completed!"; } || { echo "Error: Failed to copy xfce4 config files."; exit 1; } 2>&1 | tee -a "$LOG" - cp -r assets/Thunar ~/.config/ && { echo "Copy Thunar completed!"; } || { echo "Error: Failed to copy Thunar config files."; exit 1; } 2>&1 | tee -a "$LOG" - clear \ No newline at end of file +# copying from assets +cp -r assets/xfce4 ~/.config/ && echo "Copy xfce4 completed!" || echo "Error: Failed to copy xfce4 config files." 2>&1 | tee -a "$LOG" +cp -r assets/Thunar ~/.config/ && echo "Copy Thunar completed!" || echo "Error: Failed to copy Thunar config files." 2>&1 | tee -a "$LOG" + +clear diff --git a/install-scripts/xdph.sh b/install-scripts/xdph.sh index b8be5e8..80b8a9e 100644 --- a/install-scripts/xdph.sh +++ b/install-scripts/xdph.sh @@ -55,8 +55,10 @@ printf "${NOTE} Checking for other XDG-Desktop-Portal-Implementations....\n" sleep 1 printf "\n" printf "${NOTE} XDG-desktop-portal-KDE (if installed) should be manually disabled or removed! I can't remove it... sorry...\n" -read -n1 -rep "${CAT} Would you like me to try to remove other XDG-Desktop-Portal-Implementations? (y/n)" XDPH1 +read -rp "${CAT} Would you like to try to remove other XDG-Desktop-Portal-Implementations? (y/n) " XDPH1 +echo sleep 1 + if [[ $XDPH1 =~ ^[Yy]$ ]]; then # Clean out other portals printf "${NOTE} Clearing any other xdg-desktop-portal implementations...\n" diff --git a/install-scripts/zsh.sh b/install-scripts/zsh.sh index 9208c84..10f8d66 100644 --- a/install-scripts/zsh.sh +++ b/install-scripts/zsh.sh @@ -44,7 +44,7 @@ printf "${WARN} #### IF YOU HAVE ALREADY ZSH AND OH MY ZSH, YOU SHOULD CHOOSE NO printf "${WARN} ### --------------------------------------------------------------------########\n" printf "${NOTE} ## CHECK OUT README FOR ADDITIONAL STEPS REQUIRED ONCE ZSH AND OH-MY-ZSH INSTALLED ##\n" printf "\n\n" -read -n1 -rep "${CAT} OPTIONAL - Would you like to install zsh and oh-my-zsh and use as default shell? (y/n)" zsh +read -rp "${CAT} OPTIONAL - Would you like to install zsh and oh-my-zsh and use as default shell? (y/n) " zsh echo if [[ $zsh =~ ^[Yy]$ ]]; then diff --git a/install.sh b/install.sh index acb0a23..3cc431f 100644 --- a/install.sh +++ b/install.sh @@ -202,20 +202,19 @@ clear printf "\n${OK} Yey! Installation Completed.\n" printf "\n" -printf "\n${NOTE} NOTICE TO NVIDIA OWNERS! IT's a MUST for your to reboot your system\n" sleep 2 printf "\n${NOTE} You can start Hyprland by typing Hyprland (IF SDDM is not installed) (note the capital H!).\n" printf "\n" printf "\n${NOTE} It is highly recommended to reboot your system.\n\n" -read -n1 -rep "${CAT} Would you like to reboot now? (y,n)" HYP -if [[ $HYP =~ ^[Yy]$ ]]; then +read -rp "${CAT} Would you like to reboot now? (y/n): " HYP + +if [[ "$HYP" =~ ^[Yy]$ ]]; then if [[ "$nvidia" == "Y" ]]; then echo "${NOTE} NVIDIA GPU detected. Rebooting the system..." systemctl reboot else systemctl reboot - fi fi