diff --git a/install-scripts/00-base.sh b/install-scripts/00-base.sh index 9c41e01..366a0af 100755 --- a/install-scripts/00-base.sh +++ b/install-scripts/00-base.sh @@ -17,7 +17,7 @@ LOG="Install-Logs/install-$(date +%d-%H%M%S)_base.log" printf "\n%s - Installing ${SKY_BLUE}base-devel${RESET} \n" "${NOTE}" for PKG1 in "${base[@]}"; do - install_package_pacman "$PKG1" | tee -a "$LOG" + install_package_pacman "$PKG1" "$LOG" done printf "\n%.0s" {1..2} \ No newline at end of file diff --git a/install-scripts/Global_functions.sh b/install-scripts/Global_functions.sh index ce3a0fe..941e7c8 100755 --- a/install-scripts/Global_functions.sh +++ b/install-scripts/Global_functions.sh @@ -65,7 +65,6 @@ install_package_pacman() { echo -e "${OK} Package ${YELLOW}$1${RESET} has been successfully installed!" else echo -e "\n${ERROR} ${YELLOW}$1${RESET} failed to install. Please check the $LOG. You may need to install manually." - exit 1 fi fi } @@ -92,7 +91,6 @@ install_package() { else # Something is missing, exiting to review log echo -e "\n${ERROR} ${YELLOW}$1${RESET} failed to install :( , please check the install.log. You may need to install manually! Sorry I have tried :(" - exit 1 fi fi } diff --git a/install-scripts/InputGroup.sh b/install-scripts/InputGroup.sh index e201d41..c02e8ae 100755 --- a/install-scripts/InputGroup.sh +++ b/install-scripts/InputGroup.sh @@ -30,7 +30,6 @@ while true; do fi if [[ $input_group_choid == "y" || $input_group_choid == "Y" ]]; then - # Check if the 'input' group exists if grep -q '^input:' /etc/group; then echo "${OK} ${MAGENTA}input${RESET} group exists." else @@ -40,16 +39,14 @@ while true; do echo "${MAGENTA}input${RESET} group created" >> "$LOG" fi - # Add the user to the input group sudo usermod -aG input "$(whoami)" echo "${OK} ${YELLOW}user${RESET} added to the ${MAGENTA}input${RESET} group. Changes will take effect after you log out and log back in." - # Log the addition of the user to the 'input' group echo "User added to 'input' group" >> "$LOG" - break # Break out of the loop if 'yes' is chosen + break elif [[ $input_group_choid == "n" || $input_group_choid == "N" ]]; then echo "${NOTE} No changes made. Exiting the script." - break # Break out of the loop if 'no' is chosen + break else echo "${ERROR} Invalid choice. Please enter 'y' for yes or 'n' for no." fi diff --git a/install-scripts/pipewire.sh b/install-scripts/pipewire.sh index ba1fc49..24dfdf6 100755 --- a/install-scripts/pipewire.sh +++ b/install-scripts/pipewire.sh @@ -41,3 +41,5 @@ systemctl --user enable --now pipewire.socket pipewire-pulse.socket wireplumber. systemctl --user enable --now pipewire.service 2>&1 | tee -a "$LOG" echo -e "\n${OK} Pipewire Installation and services setup complete!" 2>&1 | tee -a "$LOG" + +printf "\n%.0s" {1..2}