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

1 files changed, 4 insertions, 6 deletions

diff --git a/fw-addr-lists.rsc b/fw-addr-lists.rsc
index 8ba0147..6071f7b 100644
--- a/fw-addr-lists.rsc
+++ b/fw-addr-lists.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 FetchUserAgent;
   :global FwAddrLists;
@@ -35,7 +35,7 @@
   }
 
   :if ([ $ScriptLock $ScriptName ] = false) do={
-    :return false;
+    :error false;
   }
   $WaitFullyConnected;
 
@@ -156,6 +156,4 @@
 
     $LogPrintExit2 info $ScriptName ("list: " . $FwListName . " -- added: " . $CntAdd . " - renewed: " . $CntRenew . " - removed: " . $CntRemove) false;
   }
-}
-
-$Main [ :jobname ];
+} on-error={ }