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 /ipv6-update.rsc | |
parent | b86d6314868596dacdf422db80ef0ff27c61c644 (diff) | |
parent | f0856c264e07804a229668268a457f2154cb373a (diff) |
Merge branch 'do-with-on-error' into nextrouteros-7.15beta4-2
Diffstat (limited to 'ipv6-update.rsc')
-rw-r--r-- | ipv6-update.rsc | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/ipv6-update.rsc b/ipv6-update.rsc index d173347..8ce1e4d 100644 --- a/ipv6-update.rsc +++ b/ipv6-update.rsc @@ -11,16 +11,17 @@ :global GlobalFunctionsReady; :while ($GlobalFunctionsReady != true) do={ :delay 500ms; } -:local Main do={ - :local ScriptName [ :tostr $1 ]; - :local PdPrefix $2; +:do { + :local ScriptName [ :jobname ]; :global LogPrintExit2; :global ParseKeyValueStore; :global ScriptLock; + :local PdPrefix $"pd-prefix"; + :if ([ $ScriptLock $ScriptName ] = false) do={ - :return false; + :error false; } :if ([ :typeof $PdPrefix ] = "nothing") do={ @@ -82,6 +83,4 @@ } } } -} - -$Main [ :jobname ] $"pd-prefix"; +} on-error={ } |