diff options
author | Christian Hesse <mail@eworm.de> | 2024-03-06 23:53:50 +0100 |
---|---|---|
committer | Christian Hesse <mail@eworm.de> | 2024-03-12 15:27:15 +0100 |
commit | 6fd39bd3c5d7c3fe5dca9e92275f60e0b3217f03 (patch) | |
tree | 7ced2fbdb536447b537a967e945600ba6dd78c8a /capsman-rolling-upgrade.capsman.rsc | |
parent | b86d6314868596dacdf422db80ef0ff27c61c644 (diff) | |
parent | f0856c264e07804a229668268a457f2154cb373a (diff) |
Merge branch 'do-with-on-error' into nextrouteros-7.15beta4-2
Diffstat (limited to 'capsman-rolling-upgrade.capsman.rsc')
-rw-r--r-- | capsman-rolling-upgrade.capsman.rsc | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/capsman-rolling-upgrade.capsman.rsc b/capsman-rolling-upgrade.capsman.rsc index 9379b24..16a3498 100644 --- a/capsman-rolling-upgrade.capsman.rsc +++ b/capsman-rolling-upgrade.capsman.rsc @@ -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={ } |