Merge branch 'do-with-on-error' into nextrouteros-7.15beta4-2

1 files changed, 4 insertions, 6 deletions

diff --git a/daily-psk.template.rsc b/daily-psk.template.rsc
index c45f34a..4403fe6 100644
--- a/daily-psk.template.rsc
+++ b/daily-psk.template.rsc
@@ -15,8 +15,8 @@
 :global GlobalFunctionsReady;
 :while ($GlobalFunctionsReady != true) do={ :delay 500ms; }
 
-:local Main do={
-  :local ScriptName [ :tostr $1 ];
+:do {
+  :local ScriptName [ :jobname ];
 
   :global DailyPskMatchComment;
   :global DailyPskQrCodeUrl;
@@ -32,7 +32,7 @@
   :global WaitFullyConnected;
 
   :if ([ $ScriptLock $ScriptName ] = false) do={
-    :return false;
+    :error false;
   }
   $WaitFullyConnected;
 
@@ -104,6 +104,4 @@
       }
     }
   }
-}
-
-$Main [ :jobname ];
+} on-error={ }