Remove refactored apts from this PR

ChrisTitusTech · Sep 17, 2024 · 09282c9 · 09282c9
1 parent b243cf0
commit 09282c9
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git 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|nala)
+        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
@@ -10,7 +10,7 @@ setupNeovim() {
         pacman)
             $ESCALATION_TOOL "$PACKAGER" -S --needed --noconfirm neovim ripgrep fzf python-virtualenv luarocks go shellcheck git
             ;;
-        apt|nala)
+        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
@@ -17,7 +17,7 @@ installDepend() {
             fi
             $AUR_HELPER -S --needed --noconfirm "$DEPENDENCIES"
             ;;
-        apt|nala)
+        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
@@ -7,7 +7,7 @@ removeSnaps() {
         pacman)
             $ESCALATION_TOOL ${PACKAGER} -Rns snapd
             ;;
-        apt|nala)
+        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
@@ -25,7 +25,7 @@ fastUpdate() {
             fi
             ;;
 
-        apt|nala)
+        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|nala)
+        nala|apt-get)
             $ESCALATION_TOOL "${PACKAGER}" update -y
             $ESCALATION_TOOL "${PACKAGER}" upgrade -y
             ;;
-Original file line number
+Diff line change
@@ Expand Up / @@ -10,7 +10,7 @@ installDepend() { @@
             pacman)
                 $ESCALATION_TOOL "$PACKAGER" -S --needed --noconfirm bash bash-completion tar bat tree unzip fontconfig git
                 ;;
-            apt|nala)
+            apt)
                 $ESCALATION_TOOL "$PACKAGER" install -y bash bash-completion tar bat tree unzip fontconfig git
                 ;;
             dnf)
@@ Expand Down @@