From f4c78ce0c806d6580b2ede98e907119b46f18fda Mon Sep 17 00:00:00 2001 From: JaKooLit Date: Wed, 5 Feb 2025 11:12:21 +0900 Subject: [PATCH] minor update --- install-scripts/01-hypr-pkgs.sh | 3 +++ install-scripts/nvidia.sh | 1 - install-scripts/rofi-wayland.sh | 2 +- install.sh | 17 ++++++----------- 4 files changed, 10 insertions(+), 13 deletions(-) diff --git a/install-scripts/01-hypr-pkgs.sh b/install-scripts/01-hypr-pkgs.sh index c3d6e35..5bc5adf 100755 --- a/install-scripts/01-hypr-pkgs.sh +++ b/install-scripts/01-hypr-pkgs.sh @@ -98,10 +98,13 @@ for PKG in "${uninstall[@]}"; do uninstall_package "$PKG" "$LOG" done +printf "\n%.0s" {1..1} + for PKG2 in "${force[@]}"; do re_install_package "$PKG2" "$LOG" done +printf "\n%.0s" {1..1} # install YAD from assets. NOTE This is downloaded from SID repo and sometimes # Trixie is removing YAD for some strange reasons diff --git a/install-scripts/nvidia.sh b/install-scripts/nvidia.sh index b9bfc7a..3cfba52 100755 --- a/install-scripts/nvidia.sh +++ b/install-scripts/nvidia.sh @@ -62,7 +62,6 @@ printf "${YELLOW} Installing ${SKY_BLUE}Nvidia packages${RESET} ...\n" install_package "$NVIDIA" "$LOG" done - # adding additional nvidia-stuff printf "${YELLOW} adding ${SKY_BLUE}nvidia-stuff${RESET} to /etc/default/grub..." diff --git a/install-scripts/rofi-wayland.sh b/install-scripts/rofi-wayland.sh index 862bd80..3712e26 100755 --- a/install-scripts/rofi-wayland.sh +++ b/install-scripts/rofi-wayland.sh @@ -52,7 +52,7 @@ MLOG="install-$(date +%d-%H%M%S)_rofi_wayland2.log" printf "\n%s - Re-installing ${SKY_BLUE}rofi-wayland dependencies${RESET}.... \n" "${INFO}" for FORCE in "${rofi[@]}"; do - re_install_package "$FORCE" 2>&1 | tee -a "$LOG" + re_install_package "$FORCE" "$LOG" done printf "\n%.0s" {1..2} diff --git a/install.sh b/install.sh index 8585f2f..ff77295 100755 --- a/install.sh +++ b/install.sh @@ -83,13 +83,6 @@ if [ ! -d Install-Logs ]; then mkdir Install-Logs fi -# Function to colorize prompts -colorize_prompt() { - local color="$1" - local message="$2" - echo -n "${color}${message}$(tput sgr0)" -} - printf "\n%.0s" {1..1} # install pciutils if detected not installed. Necessary for detecting GPU @@ -97,8 +90,8 @@ if ! dpkg -l | grep -w pciutils > /dev/null; then echo "pciutils is not installed. Installing..." sudo apt-get install -y pciutils fi -printf "\n%.0s" {1..2} +printf "\n%.0s" {1..2} # Function to colorize prompts colorize_prompt() { local color="$1" @@ -160,7 +153,9 @@ execute_script() { printf "\n" # Check if nvidia is present if lspci | grep -i "nvidia" &> /dev/null; then - ask_yes_no "-${YELLOW}NVIDIA${RESET} GPU is detected. Do you want script to configure it?" nvidia + printf "${INFO} ${YELLOW}NVIDIA GPU${RESET} detected in your system \n" + printf "${NOTE} Script will install ${YELLOW}nvidia-dkms nvidia-utils and nvidia-settings${RESET} \n" + ask_yes_no "-Do you want script to configure ${YELLOW}NVIDIA${RESET} for you?" nvidia fi printf "\n" ask_yes_no "-Install ${YELLOW}GTK themes${RESET} (required for Dark/Light function)?" gtk_themes @@ -179,13 +174,13 @@ ask_yes_no "-Install ${YELLOW}zsh${RESET}, ${YELLOW}oh-my-zsh${RESET} & (Optiona printf "\n" ask_yes_no "-Installing on ${YELLOW}Asus ROG laptops${RESET}?" rog printf "\n" -ask_yes_no "-Do you want to download pre-configured ${YELLOW}KooL Hyprland dotfiles${RESET}?" dots +ask_yes_no "-Do you want to download pre-configured ${YELLOW}KooL Hyprland dotfiles?${RESET}" dots printf "\n" # Ensuring all in the scripts folder are made executable chmod +x install-scripts/* -printf "\n%.0s" {1..3} +printf "\n%.0s" {1..2} # check if any known login managers are active when users choose to install sddm if [ "$sddm" == "y" ] || [ "$sddm" == "Y" ]; then # List of services to check