From b68318982c74ac9954b7dfa70b6742e3fdb0861c Mon Sep 17 00:00:00 2001 From: JaKooLit Date: Sat, 14 Oct 2023 01:52:23 +0900 Subject: [PATCH] updated install module --- install-scripts/00-dependencies.sh | 11 ++++++----- install-scripts/00-hypr-pkgs.sh | 11 +++++------ install-scripts/bluetooth.sh | 10 +++++----- install-scripts/fonts.sh | 10 +++++----- install-scripts/gtk_themes.sh | 10 +++++----- install-scripts/nvidia.sh | 10 +++++----- install-scripts/nwg-look.sh | 10 +++++----- install-scripts/sddm.sh | 10 +++++----- install-scripts/thunar.sh | 10 +++++----- install-scripts/zsh.sh | 11 +++++------ 10 files changed, 51 insertions(+), 52 deletions(-) diff --git a/install-scripts/00-dependencies.sh b/install-scripts/00-dependencies.sh index c80de4a..590c0e3 100755 --- a/install-scripts/00-dependencies.sh +++ b/install-scripts/00-dependencies.sh @@ -113,17 +113,17 @@ LOG="install-$(date +%d-%H%M%S)_dependencies.log" set -e -# Function for installing packages on Debian/Ubuntu +# Function for installing packages install_package() { # Checking if package is already installed - if dpkg -l | grep -q -w "$1"; then + if sudo dpkg -l | grep -q "^ii $1 " ; then echo -e "${OK} $1 is already installed. Skipping..." else # Package not installed echo -e "${NOTE} Installing $1 ..." - sudo apt-get install -y "$1" >> "$LOG" 2>&1 - # Check if the package was installed successfully - if dpkg -l | grep -q -w "$1"; then + sudo apt-get install -y "$1" 2>&1 | tee -a "$LOG" + # Making sure the package is installed + if sudo dpkg -l | grep -q "^ii $1 " ; then echo -e "\e[1A\e[K${OK} $1 was installed." else # Something is missing, exiting to review the log @@ -133,6 +133,7 @@ install_package() { fi } + # Installation of main dependencies printf "\n%s - Installing main dependencies.... \n" "${NOTE}" diff --git a/install-scripts/00-hypr-pkgs.sh b/install-scripts/00-hypr-pkgs.sh index d7a7cf6..4615877 100755 --- a/install-scripts/00-hypr-pkgs.sh +++ b/install-scripts/00-hypr-pkgs.sh @@ -73,17 +73,17 @@ LOG="install-$(date +%d-%H%M%S)_hypr-pkgs.log" set -e -# Function for installing packages on Debian/Ubuntu +# Function for installing packages install_package() { # Checking if package is already installed - if dpkg -l | grep -q -w "$1"; then + if sudo dpkg -l | grep -q "^ii $1 " ; then echo -e "${OK} $1 is already installed. Skipping..." else # Package not installed echo -e "${NOTE} Installing $1 ..." - sudo apt-get install -y "$1" >> "$LOG" 2>&1 - # Check if the package was installed successfully - if dpkg -l | grep -q -w "$1"; then + sudo apt-get install -y "$1" 2>&1 | tee -a "$LOG" + # Making sure the package is installed + if sudo dpkg -l | grep -q "^ii $1 " ; then echo -e "\e[1A\e[K${OK} $1 was installed." else # Something is missing, exiting to review the log @@ -93,7 +93,6 @@ install_package() { fi } - # Installation of main components printf "\n%s - Installing hyprland packages.... \n" "${NOTE}" diff --git a/install-scripts/bluetooth.sh b/install-scripts/bluetooth.sh index 585c6c6..6d1308d 100755 --- a/install-scripts/bluetooth.sh +++ b/install-scripts/bluetooth.sh @@ -30,17 +30,17 @@ LOG="install-$(date +%d-%H%M%S)_bluetooth.log" # Set the script to exit on error set -e -# Function for installing packages on Debian/Ubuntu +# Function for installing packages install_package() { # Checking if package is already installed - if dpkg -l | grep -q -w "$1"; then + if sudo dpkg -l | grep -q "^ii $1 " ; then echo -e "${OK} $1 is already installed. Skipping..." else # Package not installed echo -e "${NOTE} Installing $1 ..." - sudo apt-get install -y "$1" >> "$LOG" 2>&1 - # Check if the package was installed successfully - if dpkg -l | grep -q -w "$1"; then + sudo apt-get install -y "$1" 2>&1 | tee -a "$LOG" + # Making sure the package is installed + if sudo dpkg -l | grep -q "^ii $1 " ; then echo -e "\e[1A\e[K${OK} $1 was installed." else # Something is missing, exiting to review the log diff --git a/install-scripts/fonts.sh b/install-scripts/fonts.sh index 461ff93..6e84909 100644 --- a/install-scripts/fonts.sh +++ b/install-scripts/fonts.sh @@ -33,17 +33,17 @@ LOG="install-$(date +%d-%H%M%S)_fonts.log" set -e -# Function for installing packages on Debian/Ubuntu +# Function for installing packages install_package() { # Checking if package is already installed - if dpkg -l | grep -q -w "$1"; then + if sudo dpkg -l | grep -q "^ii $1 " ; then echo -e "${OK} $1 is already installed. Skipping..." else # Package not installed echo -e "${NOTE} Installing $1 ..." - sudo apt-get install -y "$1" >> "$LOG" 2>&1 - # Check if the package was installed successfully - if dpkg -l | grep -q -w "$1"; then + sudo apt-get install -y "$1" 2>&1 | tee -a "$LOG" + # Making sure the package is installed + if sudo dpkg -l | grep -q "^ii $1 " ; then echo -e "\e[1A\e[K${OK} $1 was installed." else # Something is missing, exiting to review the log diff --git a/install-scripts/gtk_themes.sh b/install-scripts/gtk_themes.sh index 8602edb..21ae76c 100755 --- a/install-scripts/gtk_themes.sh +++ b/install-scripts/gtk_themes.sh @@ -23,17 +23,17 @@ LOG="install-$(date +%d-%H%M%S)_themes.log" set -e -# Function for installing packages on Debian/Ubuntu +# Function for installing packages install_package() { # Checking if package is already installed - if dpkg -l | grep -q -w "$1"; then + if sudo dpkg -l | grep -q "^ii $1 " ; then echo -e "${OK} $1 is already installed. Skipping..." else # Package not installed echo -e "${NOTE} Installing $1 ..." - sudo apt-get install -y "$1" >> "$LOG" 2>&1 - # Check if the package was installed successfully - if dpkg -l | grep -q -w "$1"; then + sudo apt-get install -y "$1" 2>&1 | tee -a "$LOG" + # Making sure the package is installed + if sudo dpkg -l | grep -q "^ii $1 " ; then echo -e "\e[1A\e[K${OK} $1 was installed." else # Something is missing, exiting to review the log diff --git a/install-scripts/nvidia.sh b/install-scripts/nvidia.sh index 3ae41bc..f32e205 100755 --- a/install-scripts/nvidia.sh +++ b/install-scripts/nvidia.sh @@ -46,17 +46,17 @@ echo "deb http://deb.debian.org/debian/ trixie main contrib non-free non-free-fi # Update the package list sudo apt update -# Function for installing packages on Debian/Ubuntu +# Function for installing packages install_package() { # Checking if package is already installed - if dpkg -l | grep -q -w "$1"; then + if sudo dpkg -l | grep -q "^ii $1 " ; then echo -e "${OK} $1 is already installed. Skipping..." else # Package not installed echo -e "${NOTE} Installing $1 ..." - sudo apt-get install -y "$1" >> "$LOG" 2>&1 - # Check if the package was installed successfully - if dpkg -l | grep -q -w "$1"; then + sudo apt-get install -y "$1" 2>&1 | tee -a "$LOG" + # Making sure the package is installed + if sudo dpkg -l | grep -q "^ii $1 " ; then echo -e "\e[1A\e[K${OK} $1 was installed." else # Something is missing, exiting to review the log diff --git a/install-scripts/nwg-look.sh b/install-scripts/nwg-look.sh index a274ed6..879e7f9 100755 --- a/install-scripts/nwg-look.sh +++ b/install-scripts/nwg-look.sh @@ -29,17 +29,17 @@ RESET=$(tput sgr0) # Set the name of the log file to include the current date and time LOG="install-$(date +'%d-%H%M%S')_nwg-look.log" -# Function for installing packages on Debian/Ubuntu +# Function for installing packages install_package() { # Checking if package is already installed - if dpkg -l | grep -q -w "$1"; then + if sudo dpkg -l | grep -q "^ii $1 " ; then echo -e "${OK} $1 is already installed. Skipping..." else # Package not installed echo -e "${NOTE} Installing $1 ..." - sudo apt-get install -y "$1" >> "$LOG" 2>&1 - # Check if the package was installed successfully - if dpkg -l | grep -q -w "$1"; then + sudo apt-get install -y "$1" 2>&1 | tee -a "$LOG" + # Making sure the package is installed + if sudo dpkg -l | grep -q "^ii $1 " ; then echo -e "\e[1A\e[K${OK} $1 was installed." else # Something is missing, exiting to review the log diff --git a/install-scripts/sddm.sh b/install-scripts/sddm.sh index ca45c8b..3f6fbd3 100755 --- a/install-scripts/sddm.sh +++ b/install-scripts/sddm.sh @@ -38,17 +38,17 @@ LOG="install-$(date +%d-%H%M%S)_sddm.log" set -e -# Function for installing packages on Debian/Ubuntu +# Function for installing packages install_package() { # Checking if package is already installed - if dpkg -l | grep -q -w "$1"; then + if sudo dpkg -l | grep -q "^ii $1 " ; then echo -e "${OK} $1 is already installed. Skipping..." else # Package not installed echo -e "${NOTE} Installing $1 ..." - sudo apt-get install -y "$1" >> "$LOG" 2>&1 - # Check if the package was installed successfully - if dpkg -l | grep -q -w "$1"; then + sudo apt-get install -y "$1" 2>&1 | tee -a "$LOG" + # Making sure the package is installed + if sudo dpkg -l | grep -q "^ii $1 " ; then echo -e "\e[1A\e[K${OK} $1 was installed." else # Something is missing, exiting to review the log diff --git a/install-scripts/thunar.sh b/install-scripts/thunar.sh index 5ef7ac4..b1c8b98 100755 --- a/install-scripts/thunar.sh +++ b/install-scripts/thunar.sh @@ -31,17 +31,17 @@ LOG="install-$(date +%d-%H%M%S)_thunar.log" set -e -# Function for installing packages on Debian/Ubuntu +# Function for installing packages install_package() { # Checking if package is already installed - if dpkg -l | grep -q -w "$1"; then + if sudo dpkg -l | grep -q "^ii $1 " ; then echo -e "${OK} $1 is already installed. Skipping..." else # Package not installed echo -e "${NOTE} Installing $1 ..." - sudo apt-get install -y "$1" >> "$LOG" 2>&1 - # Check if the package was installed successfully - if dpkg -l | grep -q -w "$1"; then + sudo apt-get install -y "$1" 2>&1 | tee -a "$LOG" + # Making sure the package is installed + if sudo dpkg -l | grep -q "^ii $1 " ; then echo -e "\e[1A\e[K${OK} $1 was installed." else # Something is missing, exiting to review the log diff --git a/install-scripts/zsh.sh b/install-scripts/zsh.sh index a80bd07..dd2df3a 100755 --- a/install-scripts/zsh.sh +++ b/install-scripts/zsh.sh @@ -24,17 +24,17 @@ LOG="install-$(date +%d-%H%M%S)_zsh.log" set -e -# Function for installing packages on Debian/Ubuntu +# Function for installing packages install_package() { # Checking if package is already installed - if dpkg -l | grep -q -w "$1"; then + if sudo dpkg -l | grep -q "^ii $1 " ; then echo -e "${OK} $1 is already installed. Skipping..." else # Package not installed echo -e "${NOTE} Installing $1 ..." - sudo apt-get install -y "$1" >> "$LOG" 2>&1 - # Check if the package was installed successfully - if dpkg -l | grep -q -w "$1"; then + sudo apt-get install -y "$1" 2>&1 | tee -a "$LOG" + # Making sure the package is installed + if sudo dpkg -l | grep -q "^ii $1 " ; then echo -e "\e[1A\e[K${OK} $1 was installed." else # Something is missing, exiting to review the log @@ -44,7 +44,6 @@ install_package() { fi } - # zsh and oh-my-zsh printf "${WARN} #### IF YOU HAVE ALREADY ZSH AND OH MY ZSH, YOU SHOULD CHOOSE NO HERE #########\n" printf "${WARN} ### ------------------------------------------------------------------------------------------------------------------------###\n"