removed the exit on individual install scripts since its already handled by Global functions

This commit is contained in:
JaKooLit
2025-02-04 16:21:58 +09:00
parent f578249698
commit c4074aeffa
12 changed files with 5 additions and 40 deletions

View File

@@ -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}

View File

@@ -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}

View File

@@ -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}

View File

@@ -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

View File

@@ -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}

View File

@@ -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..."

View File

@@ -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"

View File

@@ -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

View File

@@ -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}

View File

@@ -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}

View File

@@ -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

View File

@@ -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