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

1 files changed, 4 insertions, 6 deletions

diff --git a/backup-cloud.rsc b/backup-cloud.rsc
index 2846d75..a3dfe0c 100644
--- a/backup-cloud.rsc
+++ b/backup-cloud.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 BackupRandomDelay;
   :global Identity;
@@ -32,7 +32,7 @@
   :global WaitFullyConnected;
 
   :if ([ $ScriptLock $ScriptName ] = false) do={
-    :return false;
+    :error false;
   }
   $WaitFullyConnected;
 
@@ -77,6 +77,4 @@
     $LogPrintExit2 error $ScriptName ("Failed uploading backup for " . $Identity . " to cloud!") true;
   }
   /file/remove "tmpfs/backup-cloud";
-}
-
-$Main [ :jobname ];
+} on-error={ }