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

1 files changed, 4 insertions, 6 deletions

diff --git a/check-certificates.rsc b/check-certificates.rsc
index e470b59..edde7f3 100644
--- a/check-certificates.rsc
+++ b/check-certificates.rsc
@@ -11,8 +11,8 @@
 :global GlobalFunctionsReady;
 :while ($GlobalFunctionsReady != true) do={ :delay 500ms; }
 
-:local Main do={
-  :local ScriptName [ :tostr $1 ];
+:do {
+  :local ScriptName [ :jobname ];
 
   :global CertRenewTime;
   :global CertRenewUrl;
@@ -132,7 +132,7 @@
   }
 
   :if ([ $ScriptLock $ScriptName ] = false) do={
-    :return false;
+    :error false;
   }
   $WaitFullyConnected;
 
@@ -216,6 +216,4 @@
           ", it is invalid after " . ($CertVal->"invalid-after") . ".") false;
     }
   }
-}
-
-$Main [ :jobname ];
+} on-error={ }