From dc9651b8eff671b67795374253fa9a69426adb9f Mon Sep 17 00:00:00 2001 From: JaKooLit Date: Sat, 14 Oct 2023 02:19:41 +0900 Subject: [PATCH] Updated install module --- README.md | 2 +- install-scripts/00-dependencies.sh | 4 ++-- install-scripts/00-hypr-pkgs.sh | 4 ++-- install-scripts/bluetooth.sh | 4 ++-- install-scripts/fonts.sh | 4 ++-- install-scripts/gtk_themes.sh | 4 ++-- install-scripts/nvidia.sh | 4 ++-- install-scripts/nwg-look.sh | 4 ++-- install-scripts/sddm.sh | 4 ++-- install-scripts/thunar.sh | 4 ++-- install-scripts/zsh.sh | 4 ++-- 11 files changed, 21 insertions(+), 21 deletions(-) diff --git a/README.md b/README.md index 64b0a36..f7ae868 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ sudo nano /etc/apt/sources.list - ensure to allow to install non-free drivers especially for users with NVIDIA gpus. You can also install non-free drivers if required. Edit install-scripts/nvidia.sh and change the nvidia stuff's if required ### 🔔 NOTICE TO UBUNTU USERS ### -- you can use this installer. During installation, you will see alot of cannot install package. This is ok because of these dependencies is for Debian. +- you can use this installer. - For Ubuntu with NVIDIA GPU's, make sure to edit the install-scripts/nvidia.sh . Delete all packages in nvidia_pkg except libva-wayland2 and nvidia-vaapi-driver and uncomment/remove # before sudo ubuntu-drivers install. You also need to delete or simply just add # in the lines 43 and 44 echo "## for nvidia... and echo "deb ........... ### 📷 Screenshots click to enlarge diff --git a/install-scripts/00-dependencies.sh b/install-scripts/00-dependencies.sh index 590c0e3..3b6ed81 100755 --- a/install-scripts/00-dependencies.sh +++ b/install-scripts/00-dependencies.sh @@ -116,14 +116,14 @@ set -e # Function for installing packages install_package() { # Checking if package is already installed - if sudo dpkg -l | grep -q "^ii $1 " ; then + if sudo dpkg -l | grep -q -w "$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" 2>&1 | tee -a "$LOG" # Making sure the package is installed - if sudo dpkg -l | grep -q "^ii $1 " ; then + if sudo dpkg -l | grep -q -w "$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/00-hypr-pkgs.sh b/install-scripts/00-hypr-pkgs.sh index 4615877..0b31ee7 100755 --- a/install-scripts/00-hypr-pkgs.sh +++ b/install-scripts/00-hypr-pkgs.sh @@ -76,14 +76,14 @@ set -e # Function for installing packages install_package() { # Checking if package is already installed - if sudo dpkg -l | grep -q "^ii $1 " ; then + if sudo dpkg -l | grep -q -w "$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" 2>&1 | tee -a "$LOG" # Making sure the package is installed - if sudo dpkg -l | grep -q "^ii $1 " ; then + if sudo dpkg -l | grep -q -w "$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/bluetooth.sh b/install-scripts/bluetooth.sh index 6d1308d..9aa68cd 100755 --- a/install-scripts/bluetooth.sh +++ b/install-scripts/bluetooth.sh @@ -33,14 +33,14 @@ set -e # Function for installing packages install_package() { # Checking if package is already installed - if sudo dpkg -l | grep -q "^ii $1 " ; then + if sudo dpkg -l | grep -q -w "$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" 2>&1 | tee -a "$LOG" # Making sure the package is installed - if sudo dpkg -l | grep -q "^ii $1 " ; then + if sudo dpkg -l | grep -q -w "$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 6e84909..cb43c01 100644 --- a/install-scripts/fonts.sh +++ b/install-scripts/fonts.sh @@ -36,14 +36,14 @@ set -e # Function for installing packages install_package() { # Checking if package is already installed - if sudo dpkg -l | grep -q "^ii $1 " ; then + if sudo dpkg -l | grep -q -w "$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" 2>&1 | tee -a "$LOG" # Making sure the package is installed - if sudo dpkg -l | grep -q "^ii $1 " ; then + if sudo dpkg -l | grep -q -w "$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 21ae76c..be22f6d 100755 --- a/install-scripts/gtk_themes.sh +++ b/install-scripts/gtk_themes.sh @@ -26,14 +26,14 @@ set -e # Function for installing packages install_package() { # Checking if package is already installed - if sudo dpkg -l | grep -q "^ii $1 " ; then + if sudo dpkg -l | grep -q -w "$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" 2>&1 | tee -a "$LOG" # Making sure the package is installed - if sudo dpkg -l | grep -q "^ii $1 " ; then + if sudo dpkg -l | grep -q -w "$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 f32e205..14a74c8 100755 --- a/install-scripts/nvidia.sh +++ b/install-scripts/nvidia.sh @@ -49,14 +49,14 @@ sudo apt update # Function for installing packages install_package() { # Checking if package is already installed - if sudo dpkg -l | grep -q "^ii $1 " ; then + if sudo dpkg -l | grep -q -w "$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" 2>&1 | tee -a "$LOG" # Making sure the package is installed - if sudo dpkg -l | grep -q "^ii $1 " ; then + if sudo dpkg -l | grep -q -w "$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 879e7f9..424380b 100755 --- a/install-scripts/nwg-look.sh +++ b/install-scripts/nwg-look.sh @@ -32,14 +32,14 @@ LOG="install-$(date +'%d-%H%M%S')_nwg-look.log" # Function for installing packages install_package() { # Checking if package is already installed - if sudo dpkg -l | grep -q "^ii $1 " ; then + if sudo dpkg -l | grep -q -w "$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" 2>&1 | tee -a "$LOG" # Making sure the package is installed - if sudo dpkg -l | grep -q "^ii $1 " ; then + if sudo dpkg -l | grep -q -w "$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 3f6fbd3..a18618a 100755 --- a/install-scripts/sddm.sh +++ b/install-scripts/sddm.sh @@ -41,14 +41,14 @@ set -e # Function for installing packages install_package() { # Checking if package is already installed - if sudo dpkg -l | grep -q "^ii $1 " ; then + if sudo dpkg -l | grep -q -w "$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" 2>&1 | tee -a "$LOG" # Making sure the package is installed - if sudo dpkg -l | grep -q "^ii $1 " ; then + if sudo dpkg -l | grep -q -w "$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 b1c8b98..607779d 100755 --- a/install-scripts/thunar.sh +++ b/install-scripts/thunar.sh @@ -34,14 +34,14 @@ set -e # Function for installing packages install_package() { # Checking if package is already installed - if sudo dpkg -l | grep -q "^ii $1 " ; then + if sudo dpkg -l | grep -q -w "$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" 2>&1 | tee -a "$LOG" # Making sure the package is installed - if sudo dpkg -l | grep -q "^ii $1 " ; then + if sudo dpkg -l | grep -q -w "$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 dd2df3a..d462d4a 100755 --- a/install-scripts/zsh.sh +++ b/install-scripts/zsh.sh @@ -27,14 +27,14 @@ set -e # Function for installing packages install_package() { # Checking if package is already installed - if sudo dpkg -l | grep -q "^ii $1 " ; then + if sudo dpkg -l | grep -q -w "$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" 2>&1 | tee -a "$LOG" # Making sure the package is installed - if sudo dpkg -l | grep -q "^ii $1 " ; then + if sudo dpkg -l | grep -q -w "$1" ; then echo -e "\e[1A\e[K${OK} $1 was installed." else # Something is missing, exiting to review the log