Skip to content

Commit

Permalink
Merge pull request #64 from JaKooLit/development
Browse files Browse the repository at this point in the history
some error message grammar corrections
  • Loading branch information
JaKooLit authored May 1, 2024
2 parents 1814aaf + 7163fcf commit 8d2e286
Show file tree
Hide file tree
Showing 16 changed files with 17 additions and 17 deletions.
2 changes: 1 addition & 1 deletion install-scripts/00-dependencies.sh
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ printf "\n%s - Installing main dependencies.... \n" "${NOTE}"
for PKG1 in "${dependencies[@]}"; do
install_package "$PKG1" 2>&1 | tee -a "$LOG"
if [ $? -ne 0 ]; then
echo -e "\e[1A\e[K${ERROR} - $PKG1 install had failed, please check the install.log"
echo -e "\e[1A\e[K${ERROR} - $PKG1 Package installation failed, Please check the installation logs"
exit 1
fi
done
Expand Down
2 changes: 1 addition & 1 deletion install-scripts/00-hypr-pkgs.sh
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ printf "\n%s - Installing hyprland packages.... \n" "${NOTE}"
for PKG1 in "${hypr_package[@]}" "${hypr_package_2[@]}" "${Extra[@]}"; do
install_package "$PKG1" 2>&1 | tee -a "$LOG"
if [ $? -ne 0 ]; then
echo -e "\e[1A\e[K${ERROR} - $PKG1 install had failed, please check the install.log"
echo -e "\e[1A\e[K${ERROR} - $PKG1 Package installation failed, Please check the installation logs"
exit 1
fi
done
Expand Down
2 changes: 1 addition & 1 deletion install-scripts/bluetooth.sh
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ LOG="Install-Logs/install-$(date +%d-%H%M%S)_bluetooth.log"
printf "${NOTE} Installing Bluetooth Packages...\n"
for BLUE in "${blue[@]}"; do
install_package "$BLUE" 2>&1 | tee -a "$LOG"
[ $? -ne 0 ] && { echo -e "\e[1A\e[K${ERROR} - $BLUE install had failed, please check the install.log"; exit 1; }
[ $? -ne 0 ] && { echo -e "\e[1A\e[K${ERROR} - $BLUE Package installation failed, Please check the installation logs"; exit 1; }
done

printf " Activating Bluetooth Services...\n"
Expand Down
2 changes: 1 addition & 1 deletion install-scripts/fonts.sh
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ printf "\n%s - Installing fonts.... \n" "${NOTE}"
for PKG1 in "${fonts[@]}"; do
install_package "$PKG1" 2>&1 | tee -a "$LOG"
if [ $? -ne 0 ]; then
echo -e "\e[1A\e[K${ERROR} - $PKG1 install had failed, please check the install.log"
echo -e "\e[1A\e[K${ERROR} - $PKG1 Package installation failed, Please check the installation logs"
exit 1
fi
done
Expand Down
2 changes: 1 addition & 1 deletion install-scripts/force-install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ LOG="Install-Logs/install-$(date +%d-%H%M%S)_force.log"
printf "${NOTE} Force installing packages...\n"
for FORCE in "${force[@]}"; do
sudo apt-get --reinstall install -y "$FORCE" 2>&1 | tee -a "$LOG"
[ $? -ne 0 ] && { echo -e "\e[1A\e[K${ERROR} - $FORCE install had failed, please check the install.log"; exit 1; }
[ $? -ne 0 ] && { echo -e "\e[1A\e[K${ERROR} - $FORCE Package installation failed, Please check the installation logs"; exit 1; }
done

clear
2 changes: 1 addition & 1 deletion install-scripts/gtk_themes.sh
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ LOG="Install-Logs/install-$(date +%d-%H%M%S)_themes.log"
for PKG1 in "${engine[@]}"; do
install_package "$PKG1" 2>&1 | tee -a "$LOG"
if [ $? -ne 0 ]; then
echo -e "\033[1A\033[K${ERROR} - $PKG1 install had failed, please check the install.log"
echo -e "\033[1A\033[K${ERROR} - $PKG1 Package installation failed, Please check the installation logs"
exit 1
fi
done
Expand Down
2 changes: 1 addition & 1 deletion install-scripts/hyprcursor.sh
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ printf "\n%s - Installing hyprcursor dependencies.... \n" "${NOTE}"
for PKG1 in "${cursor[@]}"; do
install_package "$PKG1" 2>&1 | tee -a "$LOG"
if [ $? -ne 0 ]; then
echo -e "\e[1A\e[K${ERROR} - $PKG1 install had failed, please check the install.log"
echo -e "\e[1A\e[K${ERROR} - $PKG1 Package installation failed, Please check the installation logs"
exit 1
fi
done
Expand Down
2 changes: 1 addition & 1 deletion install-scripts/hypridle.sh
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ printf "\n%s - Installing hypridle dependencies.... \n" "${NOTE}"
for PKG1 in "${idle[@]}"; do
install_package "$PKG1" 2>&1 | tee -a "$LOG"
if [ $? -ne 0 ]; then
echo -e "\e[1A\e[K${ERROR} - $PKG1 install had failed, please check the install.log"
echo -e "\e[1A\e[K${ERROR} - $PKG1 Package installation failed, Please check the installation logs"
exit 1
fi
done
Expand Down
2 changes: 1 addition & 1 deletion install-scripts/hyprlock.sh
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ printf "\n%s - Installing hyprlock dependencies.... \n" "${NOTE}"
for PKG1 in "${lock[@]}"; do
install_package "$PKG1" 2>&1 | tee -a "$LOG"
if [ $? -ne 0 ]; then
echo -e "\e[1A\e[K${ERROR} - $PKG1 install had failed, please check the install.log"
echo -e "\e[1A\e[K${ERROR} - $PKG1 Package installation failed, Please check the installation logs"
exit 1
fi
done
Expand Down
2 changes: 1 addition & 1 deletion install-scripts/nwg-look.sh
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ MLOG="install-$(date +'%d-%H%M%S')_nwg-look2.log"
for PKG1 in "${nwg_look[@]}"; do
install_package "$PKG1" 2>&1 | tee -a "$LOG"
if [ $? -ne 0 ]; then
echo -e "\033[1A\033[K${ERROR} - $PKG1 install had failed, please check the install.log"
echo -e "\033[1A\033[K${ERROR} - $PKG1 Package installation failed, Please check the installation logs"
exit 1
fi
done
Expand Down
2 changes: 1 addition & 1 deletion install-scripts/rofi-wayland.sh
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ printf "\n%s - Installing rofi-wayland dependencies.... \n" "${NOTE}"
printf "${NOTE} Force installing packages...\n"
for FORCE in "${rofi[@]}"; do
sudo apt-get --reinstall install -y "$FORCE" 2>&1 | tee -a "$LOG"
[ $? -ne 0 ] && { echo -e "\e[1A\e[K${ERROR} - $FORCE install had failed, please check the install.log"; exit 1; }
[ $? -ne 0 ] && { echo -e "\e[1A\e[K${ERROR} - $FORCE Package installation failed, Please check the installation logs"; exit 1; }
done

printf "\n\n"
Expand Down
4 changes: 2 additions & 2 deletions install-scripts/sddm.sh
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ printf "\n%s - Installing sddm.... \n" "${NOTE}"
for PKG1 in "${sddm1[@]}" ; do
sudo apt-get install --no-install-recommends -y "$PKG1" 2>&1 | tee -a "$LOG"
if [ $? -ne 0 ]; then
echo -e "\e[1A\e[K${ERROR} - $PKG1 install had failed, please check the install.log"
echo -e "\e[1A\e[K${ERROR} - $PKG1 Package installation failed, Please check the installation logs"
exit 1
fi
done
Expand All @@ -44,7 +44,7 @@ printf "\n%s - Installing sddm additional stuff.... \n" "${NOTE}"
for PKG2 in "${sddm2[@]}"; do
install_package "$PKG2" 2>&1 | tee -a "$LOG"
if [ $? -ne 0 ]; then
echo -e "\e[1A\e[K${ERROR} - $PKG2 install had failed, please check the install.log"
echo -e "\e[1A\e[K${ERROR} - $PKG2 Package installation failed, Please check the installation logs"
exit 1
fi
done
Expand Down
2 changes: 1 addition & 1 deletion install-scripts/swww.sh
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ printf "\n%s - Installing swww dependencies.... \n" "${NOTE}"
for PKG1 in "${swww[@]}"; do
install_package "$PKG1" 2>&1 | tee -a "$LOG"
if [ $? -ne 0 ]; then
echo -e "\e[1A\e[K${ERROR} - $PKG1 install had failed, please check the install.log"
echo -e "\e[1A\e[K${ERROR} - $PKG1 Package installation failed, Please check the installation logs"
exit 1
fi
done
Expand Down
2 changes: 1 addition & 1 deletion install-scripts/thunar.sh
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ LOG="Install-Logs/install-$(date +%d-%H%M%S)_thunar.log"
printf "${NOTE} Installing Thunar Packages...\n"
for THUNAR in "${thunar[@]}"; do
install_package "$THUNAR" 2>&1 | tee -a "$LOG"
[ $? -ne 0 ] && { echo -e "\e[1A\e[K${ERROR} - $THUNAR install had failed, please check the install.log"; exit 1; }
[ $? -ne 0 ] && { echo -e "\e[1A\e[K${ERROR} - $THUNAR Package installation failed, Please check the installation logs"; exit 1; }
done

# Check for existing configs and copy if does not exist
Expand Down
2 changes: 1 addition & 1 deletion install-scripts/xdph.sh
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ MLOG="install-$(date +%d-%H%M%S)_xdph2.log"
printf "${NOTE} Installing xdg-desktop-portal-gtk...\n"
for portal in "${xdg[@]}"; do
install_package "$portal" 2>&1 | tee -a "$LOG"
[ $? -ne 0 ] && { echo -e "\e[1A\e[K${ERROR} - $portal install had failed, please check the install.log"; exit 1; }
[ $? -ne 0 ] && { echo -e "\e[1A\e[K${ERROR} - $portal Package installation failed, Please check the installation logs"; exit 1; }
done

# Check if xdg-desktop-portal-hyprland folder exists and remove it
Expand Down
2 changes: 1 addition & 1 deletion install-scripts/zsh.sh
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ printf "${NOTE} Installing core zsh packages...${RESET}\n"
for ZSHP in "${zsh[@]}"; do
install_package "$ZSHP" 2>&1 | tee -a "$LOG"
if [ $? -ne 0 ]; then
echo -e "\e[1A\e[K${ERROR} - $ZSHP install had failed, please check the install.log"
echo -e "\e[1A\e[K${ERROR} - $ZSHP Package installation failed, Please check the installation logs"
fi
done

Expand Down

0 comments on commit 8d2e286

Please sign in to comment.