Merge branch 'main-function' into next

1 files changed, 94 insertions, 87 deletions

diff --git a/packages-update.rsc b/packages-update.rsc
index 863d273..325009f 100644
--- a/packages-update.rsc
+++ b/packages-update.rsc
@@ -8,121 +8,128 @@
 # download packages and reboot for installation
 # https://git.eworm.de/cgit/routeros-scripts/about/doc/packages-update.md
 
-:local 0 [ :jobname ];
 :global GlobalFunctionsReady;
 :while ($GlobalFunctionsReady != true) do={ :delay 500ms; }
 
-:global DownloadPackage;
-:global Grep;
-:global LogPrintExit2;
-:global ParseKeyValueStore;
-:global ScriptFromTerminal;
-:global ScriptLock;
-:global VersionToNum;
+:local Main do={
+  :local ScriptName [ :tostr $1 ];
 
-:global PackagesUpdateDeferReboot;
-
-:local Schedule do={
-  :global GetRandomNumber;
+  :global DownloadPackage;
+  :global Grep;
   :global LogPrintExit2;
+  :global ParseKeyValueStore;
+  :global ScriptFromTerminal;
+  :global ScriptLock;
+  :global VersionToNum;
 
-  :global RebootForUpdate do={
-    /system/reboot;
-  }
+  :global PackagesUpdateDeferReboot;
 
-  :local StartTime [ :tostr [ :totime (10800 + [ $GetRandomNumber 7200 ]) ] ];
-  /system/scheduler/add name="_RebootForUpdate" start-time=$StartTime interval=1d \
-      on-event=("/system/scheduler/remove \"_RebootForUpdate\"; " . \
-      ":global RebootForUpdate; \$RebootForUpdate;");
-  $LogPrintExit2 info $1 ("Scheduled reboot for update at " . $StartTime . \
-      " local time (" . [ /system/clock/get time-zone-name ] . ").") true;
-}
+  :local Schedule do={
+    :local ScriptName [ :tostr $1 ];
 
-$ScriptLock $0;
+    :global GetRandomNumber;
+    :global LogPrintExit2;
 
-:local Update [ /system/package/update/get ];
-
-:if ([ :typeof ($Update->"latest-version") ] = "nothing") do={
-  $LogPrintExit2 warning $0 ("Latest version is not known.") true;
-}
+    :global RebootForUpdate do={
+      /system/reboot;
+    }
 
-:if ($Update->"installed-version" = $Update->"latest-version") do={
-  $LogPrintExit2 info $0 ("Version " . $Update->"latest-version" . " is already installed.") true;
-}
+    :local StartTime [ :tostr [ :totime (10800 + [ $GetRandomNumber 7200 ]) ] ];
+    /system/scheduler/add name="_RebootForUpdate" start-time=$StartTime interval=1d \
+        on-event=("/system/scheduler/remove \"_RebootForUpdate\"; " . \
+        ":global RebootForUpdate; \$RebootForUpdate;");
+    $LogPrintExit2 info $ScriptName ("Scheduled reboot for update at " . $StartTime . \
+        " local time (" . [ /system/clock/get time-zone-name ] . ").") true;
+  }
 
-:local NumInstalled [ $VersionToNum ($Update->"installed-version") ];
-:local NumLatest [ $VersionToNum ($Update->"latest-version") ];
+  $ScriptLock $ScriptName;
 
-:if ($NumInstalled < 0x070d0000 && $NumLatest > 0x070d0000) do={
-  $LogPrintExit2 error $0 ("Migration to wireless/wifi package in RouterOS " . \
-    ($Update->"latest-version") . " is pending. Please update manually!") true;
-}
+  :local Update [ /system/package/update/get ];
 
-:local DoDowngrade false;
-:if ($NumInstalled > $NumLatest) do={
-  :if ([ $ScriptFromTerminal $0 ] = true) do={
-    :put "Latest version is older than installed one. Want to downgrade? [y/N]";
-    :if (([ /terminal/inkey timeout=60 ] % 32) = 25) do={
-      :set DoDowngrade true;
-    } else={
-      :put "Canceled...";
-    }
-  } else={
-    $LogPrintExit2 warning $0 ("Not installing downgrade automatically.") true;
+  :if ([ :typeof ($Update->"latest-version") ] = "nothing") do={
+    $LogPrintExit2 warning $ScriptName ("Latest version is not known.") true;
   }
-}
 
-:foreach Package in=[ /system/package/find where !bundle ] do={
-  :local PkgName [ /system/package/get $Package name ];
-  :if ([ $DownloadPackage $PkgName ($Update->"latest-version") ] = false) do={
-    $LogPrintExit2 error $0 ("Download for package " . $PkgName . " failed, update aborted.") true;
+  :if ($Update->"installed-version" = $Update->"latest-version") do={
+    $LogPrintExit2 info $ScriptName ("Version " . $Update->"latest-version" . " is already installed.") true;
   }
-}
 
-:local RunOrder ({});
-:foreach Script in=[ /system/script/find where source~("\n# provides: backup-script\\b") ] do={
-  :local ScriptVal [ /system/script/get $Script ];
-  :local Store [ $ParseKeyValueStore [ $Grep ($ScriptVal->"source") ("\23 provides: backup-script, ") ] ];
+  :local NumInstalled [ $VersionToNum ($Update->"installed-version") ];
+  :local NumLatest [ $VersionToNum ($Update->"latest-version") ];
 
-  :set ($RunOrder->($Store->"order" . "-" . $ScriptVal->"name")) ($ScriptVal->"name");
-}
+  :if ($NumInstalled < 0x070d0000 && $NumLatest > 0x070d0000) do={
+    $LogPrintExit2 error $ScriptName ("Migration to wireless/wifi package in RouterOS " . \
+      ($Update->"latest-version") . " is pending. Please update manually!") true;
+  }
 
-:foreach Order,Script in=$RunOrder do={
-  :do {
-    $LogPrintExit2 info $0 ("Running backup script " . $Script . " before update.") false;
-    /system/script/run $Script;
-  } on-error={
-    $LogPrintExit2 warning $0 ("Running backup script " . $Script . " before update failed!") false;
-    :if ([ $ScriptFromTerminal $0 ] = true) do={
-      :put "Do you want to continue anyway? [y/N]";
+  :local DoDowngrade false;
+  :if ($NumInstalled > $NumLatest) do={
+    :if ([ $ScriptFromTerminal $ScriptName ] = true) do={
+      :put "Latest version is older than installed one. Want to downgrade? [y/N]";
       :if (([ /terminal/inkey timeout=60 ] % 32) = 25) do={
-        $LogPrintExit2 info $0 ("User requested to continue anyway.") false;
+        :set DoDowngrade true;
       } else={
-        $LogPrintExit2 info $0 ("Canceled update...") true;
+        :put "Canceled...";
       }
     } else={
-      $LogPrintExit2 info $0 ("Canceled non-interactive update.") true;
+      $LogPrintExit2 warning $ScriptName ("Not installing downgrade automatically.") true;
     }
   }
-}
 
-:if ($DoDowngrade = true) do={
-  $LogPrintExit2 info $0 ("Rebooting for downgrade.") false;
-  :delay 1s;
-  /system/package/downgrade;
-}
+  :foreach Package in=[ /system/package/find where !bundle ] do={
+    :local PkgName [ /system/package/get $Package name ];
+    :if ([ $DownloadPackage $PkgName ($Update->"latest-version") ] = false) do={
+      $LogPrintExit2 error $ScriptName ("Download for package " . $PkgName . " failed, update aborted.") true;
+    }
+  }
 
-:if ([ $ScriptFromTerminal $0 ] = true) do={
-  :put "Do you want to (s)chedule reboot or (r)eboot now? [s/R]";
-  :if (([ /terminal/inkey timeout=60 ] % 32) = 19) do={
-    $Schedule $0;
+  :local RunOrder ({});
+  :foreach Script in=[ /system/script/find where source~("\n# provides: backup-script\\b") ] do={
+    :local ScriptVal [ /system/script/get $Script ];
+    :local Store [ $ParseKeyValueStore [ $Grep ($ScriptVal->"source") ("\23 provides: backup-script, ") ] ];
+
+    :set ($RunOrder->($Store->"order" . "-" . $ScriptVal->"name")) ($ScriptVal->"name");
   }
-} else={
-  :if ($PackagesUpdateDeferReboot = true) do={
-    $Schedule $0;
+
+  :foreach Order,Script in=$RunOrder do={
+    :do {
+      $LogPrintExit2 info $ScriptName ("Running backup script " . $Script . " before update.") false;
+      /system/script/run $Script;
+    } on-error={
+      $LogPrintExit2 warning $ScriptName ("Running backup script " . $Script . " before update failed!") false;
+      :if ([ $ScriptFromTerminal $ScriptName ] = true) do={
+        :put "Do you want to continue anyway? [y/N]";
+        :if (([ /terminal/inkey timeout=60 ] % 32) = 25) do={
+          $LogPrintExit2 info $ScriptName ("User requested to continue anyway.") false;
+        } else={
+          $LogPrintExit2 info $ScriptName ("Canceled update...") true;
+        }
+      } else={
+        $LogPrintExit2 info $ScriptName ("Canceled non-interactive update.") true;
+      }
+    }
   }
+
+  :if ($DoDowngrade = true) do={
+    $LogPrintExit2 info $ScriptName ("Rebooting for downgrade.") false;
+    :delay 1s;
+    /system/package/downgrade;
+  }
+
+  :if ([ $ScriptFromTerminal $ScriptName ] = true) do={
+    :put "Do you want to (s)chedule reboot or (r)eboot now? [s/R]";
+    :if (([ /terminal/inkey timeout=60 ] % 32) = 19) do={
+      $Schedule $ScriptName;
+    }
+  } else={
+    :if ($PackagesUpdateDeferReboot = true) do={
+      $Schedule $ScriptName;
+    }
+  }
+
+  $LogPrintExit2 info $ScriptName ("Rebooting for update.") false;
+  :delay 1s;
+  /system/reboot;
 }
 
-$LogPrintExit2 info $0 ("Rebooting for update.") false;
-:delay 1s;
-/system/reboot;
+$Main [ :jobname ];