From 61cddeb2566f0c874c15428986381832203f3591 Mon Sep 17 00:00:00 2001
From: JEEVITHA KANNAN K S <ksjeevithakannan123@gmail.com>
Date: Mon, 16 Sep 2024 19:34:15 +0530
Subject: [PATCH 1/3] Swap nala apt-get

---
 tabs/common-script.sh                           |  2 +-
 tabs/system-setup/3-global-theme.sh             | 16 ++++++++--------
 tabs/utils/monitor-control/utility_functions.sh |  5 +++--
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/tabs/common-script.sh b/tabs/common-script.sh
index aa4deae95..45d925e77 100644
--- a/tabs/common-script.sh
+++ b/tabs/common-script.sh
@@ -125,7 +125,7 @@ checkDistro() {
 
 checkEnv() {
     checkCommandRequirements 'curl groups sudo'
-    checkPackageManager 'apt-get nala dnf pacman zypper yum xbps-install nix-env'
+    checkPackageManager 'nala apt-get dnf pacman zypper yum xbps-install nix-env'
     checkCurrentDirectoryWritable
     checkSuperUser
     checkDistro
diff --git a/tabs/system-setup/3-global-theme.sh b/tabs/system-setup/3-global-theme.sh
index c3e360da5..d5b1c6670 100644
--- a/tabs/system-setup/3-global-theme.sh
+++ b/tabs/system-setup/3-global-theme.sh
@@ -5,20 +5,20 @@
 install_theme_tools() {
     printf "%b\n" "${YELLOW}Installing theme tools (qt6ct and kvantum)...${RC}\n"
     case $PACKAGER in
-        apt-get)
-            $ESCALATION_TOOL apt-get update
-            $ESCALATION_TOOL apt-get install -y qt6ct kvantum
+        apt-get|nala)
+            $ESCALATION_TOOL "${PACKAGER}" update
+            $ESCALATION_TOOL "${PACKAGER}" install -y qt6ct kvantum
             ;;
         zypper)
-            $ESCALATION_TOOL zypper refresh
-            $ESCALATION_TOOL zypper --non-interactive install qt6ct kvantum
+            $ESCALATION_TOOL "${PACKAGER}" refresh
+            $ESCALATION_TOOL "${PACKAGER}" --non-interactive install qt6ct kvantum
             ;;
         dnf)
-            $ESCALATION_TOOL dnf update
-            $ESCALATION_TOOL dnf install -y qt6ct kvantum
+            $ESCALATION_TOOL "${PACKAGER}" update
+            $ESCALATION_TOOL "${PACKAGER}" install -y qt6ct kvantum
             ;;
         pacman)
-            $ESCALATION_TOOL pacman -S --needed --noconfirm qt6ct kvantum
+            $ESCALATION_TOOL "${PACKAGER}" -S --needed --noconfirm qt6ct kvantum
             ;;
         *)
             printf "%b\n" "${RED}Unsupported package manager. Please install qt6ct and kvantum manually.${RC}\n"
diff --git a/tabs/utils/monitor-control/utility_functions.sh b/tabs/utils/monitor-control/utility_functions.sh
index 48b4c8da9..d2bde1513 100755
--- a/tabs/utils/monitor-control/utility_functions.sh
+++ b/tabs/utils/monitor-control/utility_functions.sh
@@ -10,7 +10,7 @@ setup_xrandr() {
             pacman)
                 $ESCALATION_TOOL "${PACKAGER}" -S --noconfirm xorg-xrandr
                 ;;
-            apt-get)
+            apt-get|nala)
                 $ESCALATION_TOOL "${PACKAGER}" install -y x11-xserver-utils
                 ;;
             *)
@@ -83,4 +83,5 @@ confirm_action() {
 }
 
 checkEnv
-setup_xrandr
\ No newline at end of file
+checkEscalationTool
+setup_xrandr

From 8df764a6e3f65a74ea0a58789c8374fb73d88b06 Mon Sep 17 00:00:00 2001
From: JEEVITHA KANNAN K S <ksjeevithakannan123@gmail.com>
Date: Tue, 17 Sep 2024 17:53:23 +0530
Subject: [PATCH 2/3] Refactor remaining variables

---
 tabs/applications-setup/alacritty-setup.sh    |  6 ++--
 tabs/applications-setup/fastfetch-setup.sh    |  6 ++--
 tabs/applications-setup/kitty-setup.sh        |  6 ++--
 tabs/common-script.sh                         |  2 +-
 tabs/security/firewall-baselines.sh           |  6 ++--
 tabs/system-setup/1-compile-setup.sh          |  2 +-
 tabs/system-setup/3-global-theme.sh           | 16 ++++-----
 tabs/system-setup/4-remove-snaps.sh           | 10 +++---
 tabs/system-setup/arch/paru-setup.sh          |  2 +-
 tabs/system-setup/arch/yay-setup.sh           |  2 +-
 tabs/system-setup/fedora/rpm-fusion-setup.sh  |  2 +-
 tabs/system-setup/system-update.sh            | 36 +++++++++----------
 tabs/utils/bluetooth-control.sh               |  7 ++--
 .../monitor-control/utility_functions.sh      |  8 ++---
 tabs/utils/numlock.sh                         |  1 +
 tabs/utils/wifi-control.sh                    |  9 ++---
 16 files changed, 62 insertions(+), 59 deletions(-)

diff --git a/tabs/applications-setup/alacritty-setup.sh b/tabs/applications-setup/alacritty-setup.sh
index 92e49d337..eb8a5d4bb 100755
--- a/tabs/applications-setup/alacritty-setup.sh
+++ b/tabs/applications-setup/alacritty-setup.sh
@@ -5,12 +5,12 @@
 setupAlacritty() {
     echo "Install Alacritty if not already installed..."
     if ! command_exists alacritty; then
-        case ${PACKAGER} in
+        case "$PACKAGER" in
             pacman)
-                $ESCALATION_TOOL ${PACKAGER} -S --needed --noconfirm alacritty
+                $ESCALATION_TOOL "$PACKAGER" -S --needed --noconfirm alacritty
                 ;;
             *)
-                $ESCALATION_TOOL ${PACKAGER} install -y alacritty
+                $ESCALATION_TOOL "$PACKAGER" install -y alacritty
                 ;;
         esac
     else
diff --git a/tabs/applications-setup/fastfetch-setup.sh b/tabs/applications-setup/fastfetch-setup.sh
index e3f9a4f72..1415f9a8c 100644
--- a/tabs/applications-setup/fastfetch-setup.sh
+++ b/tabs/applications-setup/fastfetch-setup.sh
@@ -5,12 +5,12 @@
 setupFastfetch() {
     echo "Installing Fastfetch if not already installed..."
     if ! command_exists fastfetch; then
-        case ${PACKAGER} in
+        case "$PACKAGER" in
             pacman)
-                $ESCALATION_TOOL "${PACKAGER}" -S --needed --noconfirm fastfetch
+                $ESCALATION_TOOL "$PACKAGER" -S --needed --noconfirm fastfetch
                 ;;
             *)
-                $ESCALATION_TOOL "${PACKAGER}" install -y fastfetch
+                $ESCALATION_TOOL "$PACKAGER" install -y fastfetch
                 ;;
         esac
     else
diff --git a/tabs/applications-setup/kitty-setup.sh b/tabs/applications-setup/kitty-setup.sh
index 7afbbe5d8..5195a9ccd 100755
--- a/tabs/applications-setup/kitty-setup.sh
+++ b/tabs/applications-setup/kitty-setup.sh
@@ -5,12 +5,12 @@
 setupKitty() {
     echo "Install Kitty if not already installed..."
     if ! command_exists kitty; then
-        case ${PACKAGER} in
+        case "$PACKAGER" in
             pacman)
-                $ESCALATION_TOOL "${PACKAGER}" -S --needed --noconfirm kitty
+                $ESCALATION_TOOL "$PACKAGER" -S --needed --noconfirm kitty
                 ;;
             *)
-                $ESCALATION_TOOL "${PACKAGER}" install -y kitty
+                $ESCALATION_TOOL "$PACKAGER" install -y kitty
                 ;;
         esac
     else
diff --git a/tabs/common-script.sh b/tabs/common-script.sh
index 45d925e77..75e80db8f 100644
--- a/tabs/common-script.sh
+++ b/tabs/common-script.sh
@@ -81,7 +81,7 @@ checkPackageManager() {
         fi
     done
 
-    if [ -z "${PACKAGER}" ]; then
+    if [ -z "$PACKAGER" ]; then
         printf "%b\n" "${RED}Can't find a supported package manager${RC}"
         exit 1
     fi
diff --git a/tabs/security/firewall-baselines.sh b/tabs/security/firewall-baselines.sh
index 5abb0c766..951b6415a 100644
--- a/tabs/security/firewall-baselines.sh
+++ b/tabs/security/firewall-baselines.sh
@@ -5,12 +5,12 @@
 installPkg() {
     echo "Install UFW if not already installed..."
     if ! command_exists ufw; then
-        case ${PACKAGER} in
+        case "$PACKAGER" in
             pacman)
-                $ESCALATION_TOOL "${PACKAGER}" -S --needed --noconfirm ufw
+                $ESCALATION_TOOL "$PACKAGER" -S --needed --noconfirm ufw
                 ;;
             *)
-                $ESCALATION_TOOL "${PACKAGER}" install -y ufw
+                $ESCALATION_TOOL "$PACKAGER" install -y ufw
                 ;;
         esac
     else
diff --git a/tabs/system-setup/1-compile-setup.sh b/tabs/system-setup/1-compile-setup.sh
index a9d21890d..14ef06cd6 100755
--- a/tabs/system-setup/1-compile-setup.sh
+++ b/tabs/system-setup/1-compile-setup.sh
@@ -6,7 +6,7 @@ installDepend() {
     ## Check for dependencies.
     DEPENDENCIES='tar tree multitail tldr trash-cli unzip cmake make jq'
     printf "%b\n" "${YELLOW}Installing dependencies...${RC}"
-    case $PACKAGER in
+    case "$PACKAGER" in
         pacman)
             if ! grep -q "^\s*\[multilib\]" /etc/pacman.conf; then
                 echo "[multilib]" | $ESCALATION_TOOL tee -a /etc/pacman.conf
diff --git a/tabs/system-setup/3-global-theme.sh b/tabs/system-setup/3-global-theme.sh
index d5b1c6670..141d0dd22 100644
--- a/tabs/system-setup/3-global-theme.sh
+++ b/tabs/system-setup/3-global-theme.sh
@@ -4,21 +4,21 @@
 
 install_theme_tools() {
     printf "%b\n" "${YELLOW}Installing theme tools (qt6ct and kvantum)...${RC}\n"
-    case $PACKAGER in
+    case "$PACKAGER" in
         apt-get|nala)
-            $ESCALATION_TOOL "${PACKAGER}" update
-            $ESCALATION_TOOL "${PACKAGER}" install -y qt6ct kvantum
+            $ESCALATION_TOOL "$PACKAGER" update
+            $ESCALATION_TOOL "$PACKAGER" install -y qt6ct kvantum
             ;;
         zypper)
-            $ESCALATION_TOOL "${PACKAGER}" refresh
-            $ESCALATION_TOOL "${PACKAGER}" --non-interactive install qt6ct kvantum
+            $ESCALATION_TOOL "$PACKAGER" refresh
+            $ESCALATION_TOOL "$PACKAGER" --non-interactive install qt6ct kvantum
             ;;
         dnf)
-            $ESCALATION_TOOL "${PACKAGER}" update
-            $ESCALATION_TOOL "${PACKAGER}" install -y qt6ct kvantum
+            $ESCALATION_TOOL "$PACKAGER" update
+            $ESCALATION_TOOL "$PACKAGER" install -y qt6ct kvantum
             ;;
         pacman)
-            $ESCALATION_TOOL "${PACKAGER}" -S --needed --noconfirm qt6ct kvantum
+            $ESCALATION_TOOL "$PACKAGER" -S --needed --noconfirm qt6ct kvantum
             ;;
         *)
             printf "%b\n" "${RED}Unsupported package manager. Please install qt6ct and kvantum manually.${RC}\n"
diff --git a/tabs/system-setup/4-remove-snaps.sh b/tabs/system-setup/4-remove-snaps.sh
index f804aa5b8..5d8996487 100644
--- a/tabs/system-setup/4-remove-snaps.sh
+++ b/tabs/system-setup/4-remove-snaps.sh
@@ -3,21 +3,21 @@
 . ../common-script.sh
 
 removeSnaps() {
-    case $PACKAGER in
+    case "$PACKAGER" in
         pacman)
-            $ESCALATION_TOOL ${PACKAGER} -Rns snapd
+            $ESCALATION_TOOL "$PACKAGER" -Rns snapd
             ;;
         apt-get|nala)
-            $ESCALATION_TOOL ${PACKAGER} autoremove --purge snapd
+            $ESCALATION_TOOL "$PACKAGER" autoremove --purge snapd
             if [ "$ID" = ubuntu ]; then
                 $ESCALATION_TOOL apt-mark hold snapd
             fi
             ;;
         dnf)
-            $ESCALATION_TOOL ${PACKAGER} remove snapd
+            $ESCALATION_TOOL "$PACKAGER" remove snapd
             ;;
         zypper)
-            $ESCALATION_TOOL ${PACKAGER} remove snapd
+            $ESCALATION_TOOL "$PACKAGER" remove snapd
             ;;
         *)
             echo "Removing snapd not implemented for this package manager"
diff --git a/tabs/system-setup/arch/paru-setup.sh b/tabs/system-setup/arch/paru-setup.sh
index 51edfb09e..490935157 100755
--- a/tabs/system-setup/arch/paru-setup.sh
+++ b/tabs/system-setup/arch/paru-setup.sh
@@ -3,7 +3,7 @@
 . ../../common-script.sh
 
 installDepend() {
-    case $PACKAGER in
+    case "$PACKAGER" in
         pacman)
             if ! command_exists paru; then
                 echo "Installing paru as AUR helper..."
diff --git a/tabs/system-setup/arch/yay-setup.sh b/tabs/system-setup/arch/yay-setup.sh
index 010192ce5..25fb2ee88 100755
--- a/tabs/system-setup/arch/yay-setup.sh
+++ b/tabs/system-setup/arch/yay-setup.sh
@@ -3,7 +3,7 @@
 . ../../common-script.sh
 
 installDepend() {
-    case $PACKAGER in
+    case "$PACKAGER" in
         pacman)
             if ! command_exists yay; then
                 echo "Installing yay as AUR helper..."
diff --git a/tabs/system-setup/fedora/rpm-fusion-setup.sh b/tabs/system-setup/fedora/rpm-fusion-setup.sh
index 52396d5df..f611a0be1 100644
--- a/tabs/system-setup/fedora/rpm-fusion-setup.sh
+++ b/tabs/system-setup/fedora/rpm-fusion-setup.sh
@@ -5,7 +5,7 @@
 # https://rpmfusion.org/Configuration
 
 installRPMFusion() {
-    case $PACKAGER in
+    case "$PACKAGER" in
         dnf)
             if [ ! -e /etc/yum.repos.d/rpmfusion-free.repo ] || [ ! -e /etc/yum.repos.d/rpmfusion-nonfree.repo ]; then
                 echo "Installing RPM Fusion..."
diff --git a/tabs/system-setup/system-update.sh b/tabs/system-setup/system-update.sh
index e6b32af6d..e961e5cc3 100755
--- a/tabs/system-setup/system-update.sh
+++ b/tabs/system-setup/system-update.sh
@@ -31,27 +31,27 @@ fastUpdate() {
                 $ESCALATION_TOOL apt-get install -y nala || { printf "%b\n" "${YELLOW}Falling back to apt-get${RC}"; PACKAGER="apt-get"; }
             fi
 
-            if [ "${PACKAGER}" = "nala" ]; then
+            if [ "$PACKAGER" = "nala" ]; then
                 $ESCALATION_TOOL cp /etc/apt/sources.list /etc/apt/sources.list.bak
                 $ESCALATION_TOOL nala update
                 PACKAGER="nala"
             fi
 
-            $ESCALATION_TOOL ${PACKAGER} upgrade -y
+            $ESCALATION_TOOL "$PACKAGER" upgrade -y
             ;;
         dnf)
-            $ESCALATION_TOOL ${PACKAGER} update -y
+            $ESCALATION_TOOL "$PACKAGER" update -y
             ;;
         zypper)
-            $ESCALATION_TOOL ${PACKAGER} ref
-            $ESCALATION_TOOL ${PACKAGER} --non-interactive dup
+            $ESCALATION_TOOL "$PACKAGER" ref
+            $ESCALATION_TOOL "$PACKAGER" --non-interactive dup
             ;;
         yum)
-            $ESCALATION_TOOL ${PACKAGER} update -y
-            $ESCALATION_TOOL ${PACKAGER} upgrade -y
+            $ESCALATION_TOOL "$PACKAGER" update -y
+            $ESCALATION_TOOL "$PACKAGER" upgrade -y
             ;;
         xbps-install)
-            $ESCALATION_TOOL ${PACKAGER} -Syu
+            $ESCALATION_TOOL "$PACKAGER" -Syu
             ;;
         *)
             printf "%b\n" "${RED}Unsupported package manager: $PACKAGER${RC}"
@@ -62,25 +62,25 @@ fastUpdate() {
 
 updateSystem() {
     printf "%b\n" "${GREEN}Updating system${RC}"
-    case ${PACKAGER} in
+    case "$PACKAGER" in
         nala|apt-get)
-            $ESCALATION_TOOL "${PACKAGER}" update -y
-            $ESCALATION_TOOL "${PACKAGER}" upgrade -y
+            $ESCALATION_TOOL "$PACKAGER" update -y
+            $ESCALATION_TOOL "$PACKAGER" upgrade -y
             ;;
         yum|dnf)
-            $ESCALATION_TOOL "${PACKAGER}" update -y
-            $ESCALATION_TOOL "${PACKAGER}" upgrade -y
+            $ESCALATION_TOOL "$PACKAGER" update -y
+            $ESCALATION_TOOL "$PACKAGER" upgrade -y
             ;;
         pacman)
-            $ESCALATION_TOOL "${PACKAGER}" -Sy --noconfirm --needed archlinux-keyring
-            $ESCALATION_TOOL "${PACKAGER}" -Su --noconfirm
+            $ESCALATION_TOOL "$PACKAGER" -Sy --noconfirm --needed archlinux-keyring
+            $ESCALATION_TOOL "$PACKAGER" -Su --noconfirm
             ;;
         zypper)
-            $ESCALATION_TOOL ${PACKAGER} ref
-            $ESCALATION_TOOL ${PACKAGER} --non-interactive dup
+            $ESCALATION_TOOL "$PACKAGER" ref
+            $ESCALATION_TOOL "$PACKAGER" --non-interactive dup
             ;;
         xbps-install)
-            $ESCALATION_TOOL ${PACKAGER} -Syu
+            $ESCALATION_TOOL "$PACKAGER" -Syu
             ;;
         *)
             printf "%b\n" "${RED}Unsupported package manager: ${PACKAGER}${RC}"
diff --git a/tabs/utils/bluetooth-control.sh b/tabs/utils/bluetooth-control.sh
index 508d3708a..51aa16221 100644
--- a/tabs/utils/bluetooth-control.sh
+++ b/tabs/utils/bluetooth-control.sh
@@ -6,12 +6,12 @@
 setupBluetooth() {
     printf "%b\n" "${YELLOW}Installing Bluez...${RC}"
     if ! command_exists bluetoothctl; then
-        case ${PACKAGER} in
+        case "$PACKAGER" in
             pacman)
-                $ESCALATION_TOOL "${PACKAGER}" -S --noconfirm bluez-utils
+                $ESCALATION_TOOL "$PACKAGER" -S --noconfirm bluez-utils
                 ;;
             *)
-                $ESCALATION_TOOL "${PACKAGER}" install -y bluez
+                $ESCALATION_TOOL "$PACKAGER" install -y bluez
                 ;;
         esac
     else
@@ -147,5 +147,6 @@ remove_device() {
 
 # Initialize
 checkEnv
+checkEscalationTool
 setupBluetooth
 main_menu
diff --git a/tabs/utils/monitor-control/utility_functions.sh b/tabs/utils/monitor-control/utility_functions.sh
index d2bde1513..28b4fad75 100755
--- a/tabs/utils/monitor-control/utility_functions.sh
+++ b/tabs/utils/monitor-control/utility_functions.sh
@@ -6,15 +6,15 @@
 setup_xrandr() {
     echo "Install xrandr if not already installed..."
     if ! command_exists xrandr; then
-        case ${PACKAGER} in
+        case "$PACKAGER" in
             pacman)
-                $ESCALATION_TOOL "${PACKAGER}" -S --noconfirm xorg-xrandr
+                $ESCALATION_TOOL "$PACKAGER" -S --noconfirm xorg-xrandr
                 ;;
             apt-get|nala)
-                $ESCALATION_TOOL "${PACKAGER}" install -y x11-xserver-utils
+                $ESCALATION_TOOL "$PACKAGER" install -y x11-xserver-utils
                 ;;
             *)
-                $ESCALATION_TOOL "${PACKAGER}" install -y xorg-x11-server-utils
+                $ESCALATION_TOOL "$PACKAGER" install -y xorg-x11-server-utils
                 ;;
         esac
     else
diff --git a/tabs/utils/numlock.sh b/tabs/utils/numlock.sh
index 2b23c3f16..79f2f6808 100755
--- a/tabs/utils/numlock.sh
+++ b/tabs/utils/numlock.sh
@@ -60,5 +60,6 @@ numlockSetup() {
   fi
 }
 
+checkEnv
 checkEscalationTool
 numlockSetup
diff --git a/tabs/utils/wifi-control.sh b/tabs/utils/wifi-control.sh
index 036e2a28c..2a6686a81 100644
--- a/tabs/utils/wifi-control.sh
+++ b/tabs/utils/wifi-control.sh
@@ -6,15 +6,15 @@
 setupNetworkManager() {
     printf "%b\n" "${YELLOW}Installing NetworkManager...${RC}"
     if ! command_exists nmcli; then
-        case ${PACKAGER} in
+        case "$PACKAGER" in
             pacman)
-                $ESCALATION_TOOL "${PACKAGER}" -S --noconfirm networkmanager
+                $ESCALATION_TOOL "$PACKAGER" -S --noconfirm networkmanager
                 ;;
             dnf)
-                $ESCALATION_TOOL "${PACKAGER}" install -y NetworkManager-1
+                $ESCALATION_TOOL "$PACKAGER" install -y NetworkManager-1
                 ;;
             *)
-                $ESCALATION_TOOL "${PACKAGER}" install -y network-manager
+                $ESCALATION_TOOL "$PACKAGER" install -y network-manager
                 ;;
         esac
     else
@@ -186,5 +186,6 @@ remove_network() {
 
 # Initialize
 checkEnv
+checkEscalationTool
 setupNetworkManager
 main_menu

From 16fbd336cee968a390f27cb7b7fd4728a44613cb Mon Sep 17 00:00:00 2001
From: JEEVITHA KANNAN K S <ksjeevithakannan123@gmail.com>
Date: Tue, 17 Sep 2024 18:19:41 +0530
Subject: [PATCH 3/3] Added missed packager

---
 tabs/system-setup/system-update.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tabs/system-setup/system-update.sh b/tabs/system-setup/system-update.sh
index e961e5cc3..7df96be0c 100755
--- a/tabs/system-setup/system-update.sh
+++ b/tabs/system-setup/system-update.sh
@@ -3,7 +3,7 @@
 . ../common-script.sh
 
 fastUpdate() {
-    case ${PACKAGER} in
+    case "$PACKAGER" in
         pacman)
 
           $AUR_HELPER -S --needed --noconfirm rate-mirrors-bin