aboutsummaryrefslogtreecommitdiffstats
path: root/capsman-rolling-upgrade.template.rsc
diff options
context:
space:
mode:
authorGravatar Christian Hesse <mail@eworm.de>2024-03-06 23:53:50 +0100
committerGravatar Christian Hesse <mail@eworm.de>2024-03-12 15:27:15 +0100
commit6fd39bd3c5d7c3fe5dca9e92275f60e0b3217f03 (patch)
tree7ced2fbdb536447b537a967e945600ba6dd78c8a /capsman-rolling-upgrade.template.rsc
parentb86d6314868596dacdf422db80ef0ff27c61c644 (diff)
parentf0856c264e07804a229668268a457f2154cb373a (diff)
Merge branch 'do-with-on-error' into nextrouteros-7.15beta4-2
Diffstat (limited to 'capsman-rolling-upgrade.template.rsc')
-rw-r--r--capsman-rolling-upgrade.template.rsc10
1 files changed, 4 insertions, 6 deletions
diff --git a/capsman-rolling-upgrade.template.rsc b/capsman-rolling-upgrade.template.rsc
index 731dbeb..45a5f8e 100644
--- a/capsman-rolling-upgrade.template.rsc
+++ b/capsman-rolling-upgrade.template.rsc
@@ -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={ }