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

1 files changed, 4 insertions, 6 deletions

diff --git a/backup-email.rsc b/backup-email.rsc
index c5b4568..9f6e31a 100644
--- a/backup-email.rsc
+++ b/backup-email.rsc
@@ -12,8 +12,8 @@
 :global GlobalFunctionsReady;
 :while ($GlobalFunctionsReady != true) do={ :delay 500ms; }
 
-:local Main do={
-  :local ScriptName [ :tostr $1 ];
+:do {
+  :local ScriptName [ :jobname ];
 
   :global BackupPassword;
   :global BackupRandomDelay;
@@ -46,7 +46,7 @@
   }
 
   :if ([ $ScriptLock $ScriptName ] = false) do={
-    :return false;
+    :error false;
   }
   $WaitFullyConnected;
 
@@ -114,6 +114,4 @@
     :delay 1s;
     :set I ($I + 1);
   }
-}
-
-$Main [ :jobname ];
+} on-error={ }