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

1 files changed, 4 insertions, 6 deletions

diff --git a/gps-track.rsc b/gps-track.rsc
index cef95f2..c40e2e0 100644
--- a/gps-track.rsc
+++ b/gps-track.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 GpsTrackUrl;
   :global Identity;
@@ -22,7 +22,7 @@
   :global WaitFullyConnected;
 
   :if ([ $ScriptLock $ScriptName ] = false) do={
-    :return false;
+    :error false;
   }
   $WaitFullyConnected;
 
@@ -47,6 +47,4 @@
   } else={
     $LogPrintExit2 debug $ScriptName ("GPS data not valid.") false;
   }
-}
-
-$Main [ :jobname ];
+} on-error={ }