1 files changed, 32 insertions, 9 deletions

diff --git a/packages-update.rsc b/packages-update.rsc
index b08a48d..b11596e 100644
--- a/packages-update.rsc
+++ b/packages-update.rsc
@@ -1,19 +1,25 @@
 #!rsc by RouterOS
 # RouterOS script: packages-update
-# Copyright (c) 2019-2024 Christian Hesse <mail@eworm.de>
-# https://git.eworm.de/cgit/routeros-scripts/about/COPYING.md
+# Copyright (c) 2019-2025 Christian Hesse <mail@eworm.de>
+# https://rsc.eworm.de/COPYING.md
 #
-# requires RouterOS, version=7.14
+# requires RouterOS, version=7.15
+# requires device-mode, scheduler
 #
 # download packages and reboot for installation
-# https://git.eworm.de/cgit/routeros-scripts/about/doc/packages-update.md
+# https://rsc.eworm.de/doc/packages-update.md
 
 :global GlobalFunctionsReady;
 :while ($GlobalFunctionsReady != true) do={ :delay 500ms; }
 
+:local ExitOK false;
 :do {
   :local ScriptName [ :jobname ];
 
+  :global BackupRandomDelay;
+  :global PackagesUpdateDeferReboot;
+  :global PackagesUpdateBackupFailure;
+
   :global DownloadPackage;
   :global Grep;
   :global LogPrint;
@@ -22,9 +28,6 @@
   :global ScriptLock;
   :global VersionToNum;
 
-  :global PackagesUpdateDeferReboot;
-  :global PackagesUpdateBackupFailure;
-
   :local Schedule do={
     :local ScriptName [ :tostr $1 ];
 
@@ -45,6 +48,13 @@
   }
 
   :if ([ $ScriptLock $ScriptName ] = false) do={
+    :set ExitOK true;
+    :error false;
+  }
+
+  :if ([ :len [ /system/scheduler/find where name="running-from-backup-partition" ] ] > 0) do={
+    $LogPrint warning $ScriptName ("Running from backup partition, refusing to act.");
+    :set ExitOK true;
     :error false;
   }
 
@@ -52,11 +62,13 @@
 
   :if ([ :typeof ($Update->"latest-version") ] = "nothing") do={
     $LogPrint warning $ScriptName ("Latest version is not known.");
+    :set ExitOK true;
     :error false;
   }
 
   :if ($Update->"installed-version" = $Update->"latest-version") do={
     $LogPrint info $ScriptName ("Version " . $Update->"latest-version" . " is already installed.");
+    :set ExitOK true;
     :error true;
   }
 
@@ -68,7 +80,9 @@
     :set ($RunOrder->($Store->"order" . "-" . $ScriptVal->"name")) ($ScriptVal->"name");
   }
 
+  :local BackupRandomDelayBefore $BackupRandomDelay;
   :foreach Order,Script in=$RunOrder do={
+    :set BackupRandomDelay 0;
     :set PackagesUpdateBackupFailure false;
     :do {
       $LogPrint info $ScriptName ("Running backup script " . $Script . " before update.");
@@ -76,6 +90,7 @@
     } on-error={
       :set PackagesUpdateBackupFailure true;
     }
+    :set BackupRandomDelay $BackupRandomDelayBefore;
 
     :if ($PackagesUpdateBackupFailure = true) do={
       $LogPrint warning $ScriptName ("Running backup script " . $Script . " before update failed!");
@@ -85,10 +100,12 @@
           $LogPrint info $ScriptName ("User requested to continue anyway.");
         } else={
           $LogPrint info $ScriptName ("Canceled update...");
+          :set ExitOK true;
           :error false;
         }
       } else={
         $LogPrint warning $ScriptName ("Canceled non-interactive update.");
+        :set ExitOK true;
         :error false;
       }
     }
@@ -108,14 +125,16 @@
       }
     } else={
       $LogPrint warning $ScriptName ("Not installing downgrade automatically.");
+      :set ExitOK true;
       :error false;
     }
   }
 
-  :foreach Package in=[ /system/package/find where !bundle ] do={
+  :foreach Package in=[ /system/package/find where !bundle !available ] do={
     :local PkgName [ /system/package/get $Package name ];
     :if ([ $DownloadPackage $PkgName ($Update->"latest-version") ] = false) do={
       $LogPrint error $ScriptName ("Download for package " . $PkgName . " failed, update aborted.");
+      :set ExitOK true;
       :error false;
     }
   }
@@ -130,11 +149,13 @@
     :put "Do you want to (s)chedule reboot or (r)eboot now? [s/R]";
     :if (([ /terminal/inkey timeout=60 ] % 32) = 19) do={
       $Schedule $ScriptName;
+      :set ExitOK true;
       :error true;
     }
   } else={
     :if ($PackagesUpdateDeferReboot = true) do={
       $Schedule $ScriptName;
+      :set ExitOK true;
       :error true;
     }
   }
@@ -142,4 +163,6 @@
   $LogPrint info $ScriptName ("Rebooting for update.");
   :delay 1s;
   /system/reboot;
-} on-error={ }
+} on-error={
+  :global ExitError; $ExitError $ExitOK [ :jobname ];
+}