update-packages: improvements (to be tested)

packages/ns-plug/files/update-packages

@@ -11,11 +11,15 @@
 # --force-stable: force update from stable channel even if the system has a subscription
 #
 
-# Function to perform cleanup
+error_exit() {
+    echo "$1" | logger -s -t update-packages
+    exit 1
+}
+
 cleanup() {
     if [ -f /etc/opkg/distfeeds.conf.orig ]; then
         echo "Restoring original distfeeds.conf" | logger -s -t update-packages
-        mv /etc/opkg/distfeeds.conf.orig /etc/opkg/distfeeds.conf
+        mv /etc/opkg/distfeeds.conf.orig /etc/opkg/distfeeds.conf || error_exit "Failed to restore distfeeds.conf"
     fi
 }
 
@@ -26,52 +30,41 @@ if [ "$1" = "--force-stable" ]; then
     echo "Flag force-stable is set" | logger -s -t update-packages
 fi
 
-channel='dev'
 # channel is subscription if "$(uci -q get ns-plug.config.system_id)" is not empty
-if [ -n "$(uci -q get ns-plug.config.system_id)" ]; then
-    channel='subscription'
-fi
+channel=$([ -n "$(uci -q get ns-plug.config.system_id)" ] && echo 'subscription' || echo 'dev')
 
 # Set up trap to call cleanup function on script exit
 trap cleanup EXIT
 
 # Create temporary opkg configuration
-if [ "$force" -gt 0 ]; then
+if [ "$force" -eq 1 ]; then
     channel='stable'
     # Preserve original distfeed.conf
-    cp /etc/opkg/distfeeds.conf /etc/opkg/distfeeds.conf.orig
-
-    if [ $? -ne 0 ]; then
-        echo "Failed to backup distfeeds.conf" | logger -s -t update-packages
-        exit 1
-    fi
+    cp /etc/opkg/distfeeds.conf /etc/opkg/distfeeds.conf.orig || error_exit "Failed to backup distfeeds.conf"
 
     echo "Creating temporary distfeed configuration" | logger -s -t update-packages
     # make sure to replace dev with stable in case we are using a dev image
-    cat /rom/etc/opkg/distfeeds.conf | sed 's/dev/stable/g' > /etc/opkg/distfeeds.conf
-
-    if [ $? -ne 0 ]; then
-        echo "Failed to create temporary opkg configuration" | logger -s -t update-packages
-        exit 1
-    fi
+    sed 's/dev/stable/g' /rom/etc/opkg/distfeeds.conf > /etc/opkg/distfeeds.conf || error_exit "Failed to create temporary opkg configuration"
 fi
 
 echo "Updating packages from $channel channel" | logger -s -t update-packages
 
 # Update metadata
-opkg update 2>&1 | logger -s -t update-packages
-
-if [ $? -ne 0 ]; then
-    echo "Failed to update metadata" | logger -s -t update-packages
-    exit 1
+if ! opkg update 2>&1 | logger -s -t update-packages; then
+    error_exit "Failed to update metadata"
 fi
 
 # List upgradable packages
-opkg list-upgradable | cut -f 1 -d ' ' | xargs -r opkg upgrade 2>&1 | logger -s -t update-packages
+upgradable_packages=$(opkg list-upgradable | cut -f 1 -d ' ')
 
-if [ $? -ne 0 ]; then
-    echo "Failed to upgrade packages" | logger -s -t update-packages
-    exit 1
-fi
+if [ -n "$upgradable_packages" ]; then
+    echo "Upgrading packages: $upgradable_packages" | logger -s -t update-packages
+    if ! opkg upgrade $upgradable_packages 2>&1; then
+        error_exit "Failed to upgrade packages"
+    fi
+else
+    echo "No packages to upgrade" | logger -s -t update-packages
+ fi
 
 echo "Update successful" | logger -s -t update-packages
+exit 0