Crash_Override/routeros-scripts
1
0
Fork 0
mirror of https://github.com/eworm-de/routeros-scripts synced 2024-05-14 08:04:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

packages-update: drop main function, use :do with on-error

Browse source
This commit is contained in:
Christian Hesse 2024-03-06 15:28:55 +01:00
parent 850e8db975
commit 1012d9fc51
1 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
packages-update.rsc
View file

@ -11,8 +11,8 @@
:global GlobalFunctionsReady; :global GlobalFunctionsReady;
:while ($GlobalFunctionsReady != true) do={ :delay 500ms; } :while ($GlobalFunctionsReady != true) do={ :delay 500ms; }
:local Main do={ :do {
:local ScriptName [ :tostr $1 ]; :local ScriptName [ :jobname ];
:global DownloadPackage; :global DownloadPackage;
:global Grep; :global Grep;
@ -44,7 +44,7 @@
} }
:if ([ $ScriptLock $ScriptName ] = false) do={ :if ([ $ScriptLock $ScriptName ] = false) do={
:return false; :error false;
} }
:local Update [ /system/package/update/get ]; :local Update [ /system/package/update/get ];
@ -55,7 +55,7 @@
:if ($Update->"installed-version" = $Update->"latest-version") do={ :if ($Update->"installed-version" = $Update->"latest-version") do={
$LogPrintExit2 info $ScriptName ("Version " . $Update->"latest-version" . " is already installed.") false; $LogPrintExit2 info $ScriptName ("Version " . $Update->"latest-version" . " is already installed.") false;
:return true; :error true;
} }
:local NumInstalled [ $VersionToNum ($Update->"installed-version") ]; :local NumInstalled [ $VersionToNum ($Update->"installed-version") ];
@ -134,6 +134,4 @@
$LogPrintExit2 info $ScriptName ("Rebooting for update.") false; $LogPrintExit2 info $ScriptName ("Rebooting for update.") false;
:delay 1s; :delay 1s;
/system/reboot; /system/reboot;
} } on-error={ }
$Main [ :jobname ];