diff --git a/install-scripts/01-hypr-pkgs.sh b/install-scripts/01-hypr-pkgs.sh index fd6ce8a..accd130 100755 --- a/install-scripts/01-hypr-pkgs.sh +++ b/install-scripts/01-hypr-pkgs.sh @@ -115,9 +115,6 @@ printf "\n%s - Installing ${SKY_BLUE}KooL's hyprland necessary packages${RESET} for PKG1 in "${hypr_package[@]}" "${hypr_package_2[@]}" "${Extra[@]}"; do install_package "$PKG1" "$LOG" - if [ $? -ne 0 ]; then - exit 1 - fi done printf "\n%.0s" {1..2} \ No newline at end of file diff --git a/install-scripts/ags.sh b/install-scripts/ags.sh index 610ca75..f54f8f3 100755 --- a/install-scripts/ags.sh +++ b/install-scripts/ags.sh @@ -56,10 +56,6 @@ printf "\n%s - Installing ${SKY_BLUE}Aylur's GTK shell $ags_tag${RESET} Dependen # Installing ags Dependencies for PKG1 in "${ags[@]}"; do install_package "$PKG1" "$LOG" - if [ $? -ne 0 ]; then - echo -e "\033[1A\033[K${ERROR} - $PKG1 Package installation failed, Please check the installation logs" - exit 1 - fi done printf "\n%.0s" {1..1} diff --git a/install-scripts/fonts.sh b/install-scripts/fonts.sh index 2b5e1d2..f5d883a 100755 --- a/install-scripts/fonts.sh +++ b/install-scripts/fonts.sh @@ -36,9 +36,6 @@ printf "\n%s - Installing necessary ${SKY_BLUE}fonts${RESET}.... \n" "${NOTE}" for PKG1 in "${fonts[@]}"; do install_package "$PKG1" "$LOG" - if [ $? -ne 0 ]; then - exit 1 - fi done printf "\n%.0s" {1..2} \ No newline at end of file diff --git a/install-scripts/gtk_themes.sh b/install-scripts/gtk_themes.sh index ca6aa1f..ad4fe74 100755 --- a/install-scripts/gtk_themes.sh +++ b/install-scripts/gtk_themes.sh @@ -25,9 +25,6 @@ LOG="Install-Logs/install-$(date +%d-%H%M%S)_themes.log" # installing engine needed for gtk themes for PKG1 in "${engine[@]}"; do install_package "$PKG1" "$LOG" - if [ $? -ne 0 ]; then - exit 1 - fi done # Check if the directory exists and delete it if present diff --git a/install-scripts/hyprland.sh b/install-scripts/hyprland.sh index d7b774c..8dc032e 100755 --- a/install-scripts/hyprland.sh +++ b/install-scripts/hyprland.sh @@ -37,9 +37,6 @@ fi printf "${NOTE} Installing ${SKY_BLUE}Hyprland packages${RESET} .......\n" for HYPR in "${hypr[@]}"; do install_package "$HYPR" "$LOG" - [ $? -ne 0 ] && { - exit 1 - } done printf "\n%.0s" {1..2} \ No newline at end of file diff --git a/install-scripts/pipewire.sh b/install-scripts/pipewire.sh index 04d39c5..ba1fc49 100755 --- a/install-scripts/pipewire.sh +++ b/install-scripts/pipewire.sh @@ -33,7 +33,6 @@ systemctl --user disable --now pulseaudio.socket pulseaudio.service 2>&1 | tee - echo -e "${NOTE} Installing ${SKY_BLUE}Pipewire${RESET} Packages..." for PIPEWIRE in "${pipewire[@]}"; do install_package "$PIPEWIRE" "$LOG" - [ $? -ne 0 ] && { echo -e "\e[1A\e[K${ERROR} - $PIPEWIRE Package installation failed, Please check the installation logs"; exit 1; } done echo -e "${NOTE} Activating Pipewire Services..." diff --git a/install-scripts/rog.sh b/install-scripts/rog.sh index 1e97bfb..6a3c07a 100755 --- a/install-scripts/rog.sh +++ b/install-scripts/rog.sh @@ -27,9 +27,6 @@ LOG="Install-Logs/install-$(date +%d-%H%M%S)_rog.log" printf " Installing ${SKY_BLUE}ASUS ROG packages${RESET}...\n" for ASUS in "${rog[@]}"; do install_package "$ASUS" "$LOG" - if [ $? -ne 0 ]; then - exit 1 - fi done printf " Activating ROG services...\n" diff --git a/install-scripts/sddm.sh b/install-scripts/sddm.sh index a7b822b..fdfbcfe 100755 --- a/install-scripts/sddm.sh +++ b/install-scripts/sddm.sh @@ -31,8 +31,7 @@ LOG="Install-Logs/install-$(date +%d-%H%M%S)_sddm.log" printf "${NOTE} Installing sddm and dependencies........\n" for package in "${sddm[@]}"; do install_package "$package" "$LOG" - [ $? -ne 0 ] && { echo -e "\e[1A\e[K${ERROR} - $package Package installation failed, Please check the installation logs"; exit 1; } - done + done # Check if other login managers installed and disabling its service before enabling sddm for login_manager in lightdm gdm lxdm lxdm-gtk3; do diff --git a/install-scripts/thunar.sh b/install-scripts/thunar.sh index 20ac85d..7b41df5 100755 --- a/install-scripts/thunar.sh +++ b/install-scripts/thunar.sh @@ -33,7 +33,6 @@ LOG="Install-Logs/install-$(date +%d-%H%M%S)_thunar.log" printf "${NOTE} Installing ${SKY_BLUE}Thunar${RESET} Packages...\n\n" for THUNAR in "${thunar[@]}"; do install_package "$THUNAR" "$LOG" - [ $? -ne 0 ] && { echo -e "\e[1A\e[K${ERROR} - $THUNAR Package installation failed, Please check the installation logs"; exit 1; } done printf "\n%.0s" {1..2} diff --git a/install-scripts/xdph.sh b/install-scripts/xdph.sh index 434d71e..902c0ff 100755 --- a/install-scripts/xdph.sh +++ b/install-scripts/xdph.sh @@ -26,10 +26,6 @@ LOG="Install-Logs/install-$(date +%d-%H%M%S)_xdph.log" printf "${NOTE} Installing ${SKY_BLUE}xdg-desktop-portal-hyprland${RESET}\n\n" for xdgs in "${xdg[@]}"; do install_package "$xdgs" "$LOG" - if [ $? -ne 0 ]; then - echo -e "\e[1A\e[K${ERROR} - $xdph Package installation failed, Please check the installation logs" - exit 1 - fi done printf "\n%.0s" {1..2} diff --git a/install-scripts/zsh.sh b/install-scripts/zsh.sh index 0a019ca..4bd0a05 100755 --- a/install-scripts/zsh.sh +++ b/install-scripts/zsh.sh @@ -30,9 +30,6 @@ LOG="Install-Logs/install-$(date +%d-%H%M%S)_zsh.log" printf "\n%s - Installing ${SKY_BLUE}zsh packages${RESET} .... \n" "${NOTE}" for ZSH in "${zsh_pkg[@]}"; do install_package "$ZSH" "$LOG" - if [ $? -ne 0 ]; then - exit 1 - fi done ## Optional Pokemon color scripts @@ -63,10 +60,6 @@ done if [[ "$pokemon_choice" =~ [Yy] ]]; then echo "${NOTE} Installing ${SKY_BLUE}Pokemon color scripts${RESET} ..." install_package 'pokemon-colorscripts-git' "$LOG" - if [ $? -ne 0 ]; then - echo "${ERROR} Failed to install ${YELLOW}Pokemon color scripts${RESET} . Please check the log." | tee -a "$LOG" - exit 1 - fi fi # Install Oh My Zsh, plugins, and set zsh as default shell diff --git a/install.sh b/install.sh index 6001fbd..d7cc96b 100755 --- a/install.sh +++ b/install.sh @@ -50,9 +50,9 @@ fi clear printf "\n%.0s" {1..3} -echo " | _. |/ _ _ | o _|_ " -echo " \_| (_| o |\ (_) (_) |_ | |_ " -printf "\n%.0s" {1..2} +echo -e "\e[32m | _. |/ _ _ | o _|_ \e[39m" +echo -e "\e[32m \_| (_| o |\ (_) (_) |_ | |_ 2025\e[39m" +printf "\n%.0s" {1..2} # Welcome message echo "${SKY_BLUE}Welcome to JaKooLit's Arch-Hyprland Install Script!${RESET}" @@ -66,11 +66,9 @@ echo read -p "${SKY_BLUE}Would you like to proceed? (y/n): ${RESET}" proceed -printf "\n%.0s" {1..2} - if [ "$proceed" != "y" ]; then + printf "\n%.0s" {1..2} echo "${INFO} Installation aborted. No changes done! Goodbye!" - printf "\n%.0s" {1..2} exit 1 fi