refactor: system-update.sh

jeevithakannan2 · Oct 17, 2024 · 1168167 · 1168167
1 parent 79eb752
commit 1168167
Showing 1 changed file with 28 additions and 36 deletions.
diff --git a/core/tabs/system-setup/system-update.sh b/core/tabs/system-setup/system-update.sh
@@ -5,96 +5,88 @@
 fastUpdate() {
     case "$PACKAGER" in
         pacman)
-
-            $AUR_HELPER -S --needed --noconfirm rate-mirrors-bin
+            "$AUR_HELPER" -S --needed --noconfirm rate-mirrors-bin
 
             printf "%b\n" "${YELLOW}Generating a new list of mirrors using rate-mirrors. This process may take a few seconds...${RC}"
 
-            if [ -s /etc/pacman.d/mirrorlist ]; then
+            if [ -s "/etc/pacman.d/mirrorlist" ]; then
                 "$ESCALATION_TOOL" cp /etc/pacman.d/mirrorlist /etc/pacman.d/mirrorlist.bak
             fi
 
             # If for some reason DTYPE is still unknown use always arch so the rate-mirrors does not fail
-            dtype_local=${DTYPE}
-            if [ "${DTYPE}" = "unknown" ]; then
+            dtype_local="$DTYPE"
+            if [ "$dtype_local" = "unknown" ]; then
                 dtype_local="arch"
             fi
 
-            "$ESCALATION_TOOL" rate-mirrors --top-mirrors-number-to-retest=5 --disable-comments --save /etc/pacman.d/mirrorlist --allow-root ${dtype_local}
-            if [ $? -ne 0 ] || [ ! -s /etc/pacman.d/mirrorlist ]; then
+            if ! "$ESCALATION_TOOL" rate-mirrors --top-mirrors-number-to-retest=5 --disable-comments --save /etc/pacman.d/mirrorlist --allow-root "$dtype_local" > /dev/null || [ ! -s "/etc/pacman.d/mirrorlist" ]; then
                 printf "%b\n" "${RED}Rate-mirrors failed, restoring backup.${RC}"
                 "$ESCALATION_TOOL" cp /etc/pacman.d/mirrorlist.bak /etc/pacman.d/mirrorlist
             fi
             ;;
-
         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"; }
+            if [ "$PACKAGER" = "apt-get" ]; then
+                printf "%b\n" "${YELLOW}Installing nala for faster updates.${RC}"
+                "$ESCALATION_TOOL" "$PACKAGER" update
+                if "$ESCALATION_TOOL" "$PACKAGER" install -y nala; then
+                    PACKAGER="nala";
+                    printf "%b\n" "${CYAN}Using $PACKAGER as package manager${RC}"
+                else
+                    printf "%b\n" "${RED}Nala installation failed.${RC}"
+                    printf "%b\n" "${YELLOW}Falling back to apt-get.${RC}"
+                fi
             fi
 
             if [ "$PACKAGER" = "nala" ]; then
-                "$ESCALATION_TOOL" cp /etc/apt/sources.list /etc/apt/sources.list.bak
-                "$ESCALATION_TOOL" nala update
-                PACKAGER="nala"
+                if [ -f "/etc/apt/sources.list.d/nala-sources.list" ]; then
+                    "$ESCALATION_TOOL" cp /etc/apt/sources.list.d/nala-sources.list /etc/apt/sources.list.d/nala-sources.list.bak
+                fi
+                if ! "$ESCALATION_TOOL" nala fetch --auto -y || [ ! -s "/etc/apt/sources.list.d/nala-sources.list" ]; then
+                    printf "%b\n" "${RED}Nala fetch failed, restoring backup.${RC}"
+                    "$ESCALATION_TOOL" cp /etc/apt/sources.list.d/nala-sources.list.bak /etc/apt/sources.list.d/nala-sources.list
+                fi
             fi
-
-            "$ESCALATION_TOOL" "$PACKAGER" upgrade -y
             ;;
         dnf)
             "$ESCALATION_TOOL" "$PACKAGER" update -y
             ;;
         zypper)
             "$ESCALATION_TOOL" "$PACKAGER" ref
-            "$ESCALATION_TOOL" "$PACKAGER" --non-interactive dup
             ;;
         *)
-            printf "%b\n" "${RED}Unsupported package manager: "$PACKAGER"${RC}"
+            printf "%b\n" "${RED}Unsupported package manager: ${PACKAGER}${RC}"
             exit 1
             ;;
     esac
 }
 
 updateSystem() {
-    printf "%b\n" "${GREEN}Updating system${RC}"
+    printf "%b\n" "${YELLOW}Updating system packages.${RC}"
     case "$PACKAGER" in
         apt-get|nala)
-            "$ESCALATION_TOOL" "$PACKAGER" update
             "$ESCALATION_TOOL" "$PACKAGER" upgrade -y
             ;;
         dnf)
-            "$ESCALATION_TOOL" "$PACKAGER" update -y
             "$ESCALATION_TOOL" "$PACKAGER" upgrade -y
             ;;
         pacman)
             "$ESCALATION_TOOL" "$PACKAGER" -Sy --noconfirm --needed archlinux-keyring
-            "$ESCALATION_TOOL" "$PACKAGER" -Su --noconfirm
+            "$AUR_HELPER" -Su --noconfirm
             ;;
         zypper)
-            "$ESCALATION_TOOL" "$PACKAGER" ref
             "$ESCALATION_TOOL" "$PACKAGER" --non-interactive dup
             ;;
         *)
-            printf "%b\n" "${RED}Unsupported package manager: "$PACKAGER"${RC}"
+            printf "%b\n" "${RED}Unsupported package manager: ${PACKAGER}${RC}"
             exit 1
             ;;
     esac
 }
 
 updateFlatpaks() {
     if command_exists flatpak; then
-        printf "%b\n" "${YELLOW}Updating installed Flathub apps...${RC}"
-        installed_apps=$(flatpak list --app --columns=application)
-
-        if [ -z "$installed_apps" ]; then
-            printf "%b\n" "${RED}No Flathub apps are installed.${RC}"
-            return
-        fi
-
-        for app in $installed_apps; do
-            printf "%b\n" "${YELLOW}Updating $app...${RC}"
-            flatpak update -y "$app"
-        done
+        printf "%b\n" "${YELLOW}Updating Flatpak packages.${RC}"
+        flatpak update -y
     fi
 }