mirror.MikroTik/eworm.routeros-scripts
1
0
Fork 0
mirror of https://git.eworm.de/cgit/routeros-scripts synced 2025-07-31 16:24:25 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

capsman-rolling-upgrade: 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 03309d4fdb
commit 25c9bff6f3
3 changed files with 12 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

10
capsman-rolling-upgrade.capsman.rsc
View file

@ -15,14 +15,14 @@
: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 LogPrintExit2; :global LogPrintExit2;
:global ScriptLock; :global ScriptLock;
:if ([ $ScriptLock $ScriptName ] = false) do={ :if ([ $ScriptLock $ScriptName ] = false) do={
:return false; :error false;
} }
:local InstalledVersion [ /system/package/update/get installed-version ]; :local InstalledVersion [ /system/package/update/get installed-version ];
@ -43,6 +43,4 @@
:delay ($Delay . "s"); :delay ($Delay . "s");
} }
} }
} } on-error={ }
$Main [ :jobname ];

10
capsman-rolling-upgrade.template.rsc
View file

@ -16,14 +16,14 @@
: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 LogPrintExit2; :global LogPrintExit2;
:global ScriptLock; :global ScriptLock;
:if ([ $ScriptLock $ScriptName ] = false) do={ :if ([ $ScriptLock $ScriptName ] = false) do={
:return false; :error false;
} }
:local InstalledVersion [ /system/package/update/get installed-version ]; :local InstalledVersion [ /system/package/update/get installed-version ];
@ -51,6 +51,4 @@
:delay ($Delay . "s"); :delay ($Delay . "s");
} }
} }
} } on-error={ }
$Main [ :jobname ];

10
capsman-rolling-upgrade.wifi.rsc
View file

@ -15,14 +15,14 @@
: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 LogPrintExit2; :global LogPrintExit2;
:global ScriptLock; :global ScriptLock;
:if ([ $ScriptLock $ScriptName ] = false) do={ :if ([ $ScriptLock $ScriptName ] = false) do={
:return false; :error false;
} }
:local InstalledVersion [ /system/package/update/get installed-version ]; :local InstalledVersion [ /system/package/update/get installed-version ];
@ -44,6 +44,4 @@
:delay ($Delay . "s"); :delay ($Delay . "s");
} }
} }
} } on-error={ }
$Main [ :jobname ];