hello-world: use :do with on-error...

(... and skip the move into function.)

1 files changed, 12 insertions, 9 deletions

diff --git a/hello-world.rsc b/hello-world.rsc
index 1fbe6b4..ca125e7 100644
--- a/hello-world.rsc
+++ b/hello-world.rsc
@@ -6,16 +6,19 @@
 # hello-world demo script
 # https://git.eworm.de/cgit/routeros-scripts-custom/about/doc/hello-world.md
 
-:local 0 "hello-world";
 :global GlobalFunctionsReady;
 :while ($GlobalFunctionsReady != true) do={ :delay 500ms; }
 
-:global LogPrintExit2;
-:global ScriptFromTerminal;
-:global SendNotification2;
+:do {
+  :local ScriptName [ :jobname ];
 
-:if ([ $ScriptFromTerminal $0 ] = true) do={
-  $LogPrintExit2 info $0 ("Hello world!") false;
-} else={
-  $SendNotification2 ({ origin=$0; subject="Hello..."; message="... world!" });
-}
+  :global LogPrintExit2;
+  :global ScriptFromTerminal;
+  :global SendNotification2;
+
+  :if ([ $ScriptFromTerminal $ScriptName ] = true) do={
+    $LogPrintExit2 info $ScriptName ("Hello world!") false;
+  } else={
+    $SendNotification2 ({ origin=$ScriptName; subject="Hello..."; message="... world!" });
+  }
+} on-error={ }