1 files changed, 30 insertions, 20 deletions
diff --git a/sms-action.rsc b/sms-action.rsc
index f5de11f..47e1922 100644
--- a/sms-action.rsc
+++ b/sms-action.rsc
@@ -1,31 +1,41 @@
 #!rsc by RouterOS
 # RouterOS script: sms-action
-# Copyright (c) 2018-2023 Christian Hesse <mail@eworm.de>
-# https://git.eworm.de/cgit/routeros-scripts/about/COPYING.md
+# Copyright (c) 2018-2025 Christian Hesse <mail@eworm.de>
+# https://rsc.eworm.de/COPYING.md
+#
+# requires RouterOS, version=7.15
 #
 # run action on received SMS
-# https://git.eworm.de/cgit/routeros-scripts/about/doc/sms-action.md
+# https://rsc.eworm.de/doc/sms-action.md
 
-:local 0 "sms-action";
-:global GlobalFunctionsReady;
-:while ($GlobalFunctionsReady != true) do={ :delay 500ms; }
+:local ExitOK false;
+:onerror Err {
+  :global GlobalConfigReady; :global GlobalFunctionsReady;
+  :retry { :if ($GlobalConfigReady != true || $GlobalFunctionsReady != true) \
+      do={ :error ("Global config and/or functions not ready."); }; } delay=500ms max=50;
+  :local ScriptName [ :jobname ];
 
-:global SmsAction;
+  :global SmsAction;
 
-:global LogPrintExit2;
-:global ValidateSyntax;
+  :global LogPrint;
+  :global ValidateSyntax;
 
-:local Action $action;
+  :local Action $action;
 
-:if ([ :typeof $Action ] = "nothing") do={
-  $LogPrintExit2 error $0 ("This script is supposed to run from SMS hook with action=...") true;
-}
+  :if ([ :typeof $Action ] = "nothing") do={
+    $LogPrint error $ScriptName ("This script is supposed to run from SMS hook with action=...");
+    :set ExitOK true;
+    :error false;
+  }
 
-:local Code ($SmsAction->$Action);
-:if ([ $ValidateSyntax $Code ] = true) do={
-  :log info ("Acting on SMS action '" . $Action . "': " . $Code);
-  :delay 1s;
-  [ :parse $Code ];
-} else={
-  $LogPrintExit2 warning $0 ("The code for action '" . $Action . "' failed syntax validation!") false;
+  :local Code ($SmsAction->$Action);
+  :if ([ $ValidateSyntax $Code ] = true) do={
+    :log info ("Acting on SMS action '" . $Action . "': " . $Code);
+    :delay 1s;
+    [ :parse $Code ];
+  } else={
+    $LogPrint warning $ScriptName ("The code for action '" . $Action . "' failed syntax validation!");
+  }
+} do={
+  :global ExitError; $ExitError $ExitOK [ :jobname ] $Err;
 }