From 0a3134025e0b7ba9817e3e03ad7db161be5fe941 Mon Sep 17 00:00:00 2001
From: nnyyxxxx <nnyyxxxx@users.noreply.github.com>
Date: Tue, 17 Sep 2024 06:23:57 -0400
Subject: [PATCH] phase2

---
 tabs/applications-setup/mybash-setup.sh | 2 +-
 tabs/applications-setup/neovim-setup.sh | 2 +-
 tabs/system-setup/1-compile-setup.sh    | 2 +-
 tabs/system-setup/4-remove-snaps.sh     | 2 +-
 tabs/system-setup/system-update.sh      | 4 ++--
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/tabs/applications-setup/mybash-setup.sh b/tabs/applications-setup/mybash-setup.sh
index 51d569ba0..553e20392 100644
--- a/tabs/applications-setup/mybash-setup.sh
+++ b/tabs/applications-setup/mybash-setup.sh
@@ -10,7 +10,7 @@ installDepend() {
         pacman)
             $ESCALATION_TOOL "$PACKAGER" -S --needed --noconfirm bash bash-completion tar bat tree unzip fontconfig git
             ;;
-        apt-get)
+        apt)
             $ESCALATION_TOOL "$PACKAGER" install -y bash bash-completion tar bat tree unzip fontconfig git
             ;;
         dnf)
diff --git a/tabs/applications-setup/neovim-setup.sh b/tabs/applications-setup/neovim-setup.sh
index 72cd9a219..ac97b0bf5 100755
--- a/tabs/applications-setup/neovim-setup.sh
+++ b/tabs/applications-setup/neovim-setup.sh
@@ -10,7 +10,7 @@ setupNeovim() {
         pacman)
             $ESCALATION_TOOL "$PACKAGER" -S --needed --noconfirm neovim ripgrep fzf python-virtualenv luarocks go shellcheck git
             ;;
-        apt-get)
+        apt)
             $ESCALATION_TOOL "$PACKAGER" install -y neovim ripgrep fd-find python3-venv luarocks golang-go shellcheck git
             ;;
         dnf)
diff --git a/tabs/system-setup/1-compile-setup.sh b/tabs/system-setup/1-compile-setup.sh
index e1d340924..a9d21890d 100755
--- a/tabs/system-setup/1-compile-setup.sh
+++ b/tabs/system-setup/1-compile-setup.sh
@@ -17,7 +17,7 @@ installDepend() {
             fi
             $AUR_HELPER -S --needed --noconfirm "$DEPENDENCIES"
             ;;
-        apt-get)
+        apt-get|nala)
             COMPILEDEPS='build-essential'
             $ESCALATION_TOOL "$PACKAGER" update
             $ESCALATION_TOOL dpkg --add-architecture i386
diff --git a/tabs/system-setup/4-remove-snaps.sh b/tabs/system-setup/4-remove-snaps.sh
index 2082569dd..f804aa5b8 100644
--- a/tabs/system-setup/4-remove-snaps.sh
+++ b/tabs/system-setup/4-remove-snaps.sh
@@ -7,7 +7,7 @@ removeSnaps() {
         pacman)
             $ESCALATION_TOOL ${PACKAGER} -Rns snapd
             ;;
-        apt-get)
+        apt-get|nala)
             $ESCALATION_TOOL ${PACKAGER} autoremove --purge snapd
             if [ "$ID" = ubuntu ]; then
                 $ESCALATION_TOOL apt-mark hold snapd
diff --git a/tabs/system-setup/system-update.sh b/tabs/system-setup/system-update.sh
index 4dadefe29..e6b32af6d 100755
--- a/tabs/system-setup/system-update.sh
+++ b/tabs/system-setup/system-update.sh
@@ -25,7 +25,7 @@ fastUpdate() {
             fi
             ;;
 
-        apt-get)
+        apt-get|nala)
             $ESCALATION_TOOL apt-get update
             if ! command_exists nala; then
                 $ESCALATION_TOOL apt-get install -y nala || { printf "%b\n" "${YELLOW}Falling back to apt-get${RC}"; PACKAGER="apt-get"; }
@@ -63,7 +63,7 @@ fastUpdate() {
 updateSystem() {
     printf "%b\n" "${GREEN}Updating system${RC}"
     case ${PACKAGER} in
-        apt-get)
+        nala|apt-get)
             $ESCALATION_TOOL "${PACKAGER}" update -y
             $ESCALATION_TOOL "${PACKAGER}" upgrade -y
             ;;