1
0
mirror of https://github.com/eworm-de/routeros-scripts.git synced 2024-05-11 05:55:19 +00:00

capsman-rolling-upgrade: drop main function, use :do with on-error

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

@ -15,14 +15,14 @@
:global GlobalFunctionsReady;
:while ($GlobalFunctionsReady != true) do={ :delay 500ms; }
:local Main do={
:local ScriptName [ :tostr $1 ];
:do {
:local ScriptName [ :jobname ];
:global LogPrintExit2;
:global ScriptLock;
:if ([ $ScriptLock $ScriptName ] = false) do={
:return false;
:error false;
}
:local InstalledVersion [ /system/package/update/get installed-version ];
@ -43,6 +43,4 @@
:delay ($Delay . "s");
}
}
}
$Main [ :jobname ];
} on-error={ }

@ -16,14 +16,14 @@
:global GlobalFunctionsReady;
:while ($GlobalFunctionsReady != true) do={ :delay 500ms; }
:local Main do={
:local ScriptName [ :tostr $1 ];
:do {
:local ScriptName [ :jobname ];
:global LogPrintExit2;
:global ScriptLock;
:if ([ $ScriptLock $ScriptName ] = false) do={
:return false;
:error false;
}
:local InstalledVersion [ /system/package/update/get installed-version ];
@ -51,6 +51,4 @@
:delay ($Delay . "s");
}
}
}
$Main [ :jobname ];
} on-error={ }

@ -15,14 +15,14 @@
:global GlobalFunctionsReady;
:while ($GlobalFunctionsReady != true) do={ :delay 500ms; }
:local Main do={
:local ScriptName [ :tostr $1 ];
:do {
:local ScriptName [ :jobname ];
:global LogPrintExit2;
:global ScriptLock;
:if ([ $ScriptLock $ScriptName ] = false) do={
:return false;
:error false;
}
:local InstalledVersion [ /system/package/update/get installed-version ];
@ -44,6 +44,4 @@
:delay ($Delay . "s");
}
}
}
$Main [ :jobname ];
} on-error={ }