1 files changed, 49 insertions, 34 deletions
diff --git a/lease-script.rsc b/lease-script.rsc
index f8bc129..bf27fda 100644
--- a/lease-script.rsc
+++ b/lease-script.rsc
@@ -1,50 +1,65 @@
 #!rsc by RouterOS
 # RouterOS script: lease-script
-# Copyright (c) 2013-2023 Christian Hesse <mail@eworm.de>
-# https://git.eworm.de/cgit/routeros-scripts/about/COPYING.md
+# Copyright (c) 2013-2025 Christian Hesse <mail@eworm.de>
+# https://rsc.eworm.de/COPYING.md
+#
+# requires RouterOS, version=7.15
 #
 # run scripts on DHCP lease
-# https://git.eworm.de/cgit/routeros-scripts/about/doc/lease-script.md
+# https://rsc.eworm.de/doc/lease-script.md
 
-:local 0 "lease-script";
 :global GlobalFunctionsReady;
 :while ($GlobalFunctionsReady != true) do={ :delay 500ms; }
 
-:global Grep;
-:global IfThenElse;
-:global LogPrintExit2;
-:global ParseKeyValueStore;
-:global ScriptLock;
-
-:if ([ :typeof $leaseActIP ] = "nothing" || \
-     [ :typeof $leaseActMAC ] = "nothing" || \
-     [ :typeof $leaseServerName ] = "nothing" || \
-     [ :typeof $leaseBound ] = "nothing") do={
-  $LogPrintExit2 error $0 ("This script is supposed to run from ip dhcp-server.") true;
-}
+:local ExitOK false;
+:do {
+  :local ScriptName [ :jobname ];
 
-$LogPrintExit2 debug $0 ("DHCP Server " . $leaseServerName . " " . [ $IfThenElse ($leaseBound = 0) \
-  "de" "" ] . "assigned lease " . $leaseActIP . " to " . $leaseActMAC) false;
+  :global Grep;
+  :global IfThenElse;
+  :global LogPrint;
+  :global ParseKeyValueStore;
+  :global ScriptLock;
 
-$ScriptLock $0 false 10;
+  :if ([ :typeof $leaseActIP ] = "nothing" || \
+       [ :typeof $leaseActMAC ] = "nothing" || \
+       [ :typeof $leaseServerName ] = "nothing" || \
+       [ :typeof $leaseBound ] = "nothing") do={
+    $LogPrint error $ScriptName ("This script is supposed to run from ip dhcp-server.");
+    :set ExitOK true;
+    :error false;
+  }
 
-:if ([ :len [ /system/script/job/find where script=$0 ] ] > 1) do={
-  $LogPrintExit2 debug $0 ("More invocations are waiting, exiting early.") true;
-}
+  $LogPrint debug $ScriptName ("DHCP Server " . $leaseServerName . " " . [ $IfThenElse ($leaseBound = 0) \
+    "de" "" ] . "assigned lease " . $leaseActIP . " to " . $leaseActMAC);
+
+  :if ([ $ScriptLock $ScriptName 10 ] = false) do={
+    :set ExitOK true;
+    :error false;
+  }
 
-:local RunOrder ({});
-:foreach Script in=[ /system/script/find where source~("\n# provides: lease-script\\b") ] do={
-  :local ScriptVal [ /system/script/get $Script ];
-  :local Store [ $ParseKeyValueStore [ $Grep ($ScriptVal->"source") ("\23 provides: lease-script, ") ] ];
+  :if ([ :len [ /system/script/job/find where script=$ScriptName ] ] > 1) do={
+    $LogPrint debug $ScriptName ("More invocations are waiting, exiting early.");
+    :set ExitOK true;
+    :error true;
+  }
 
-  :set ($RunOrder->($Store->"order" . "-" . $ScriptVal->"name")) ($ScriptVal->"name");
-}
+  :local RunOrder ({});
+  :foreach Script in=[ /system/script/find where source~("\n# provides: lease-script\\b") ] do={
+    :local ScriptVal [ /system/script/get $Script ];
+    :local Store [ $ParseKeyValueStore [ $Grep ($ScriptVal->"source") ("\23 provides: lease-script, ") ] ];
+
+    :set ($RunOrder->($Store->"order" . "-" . $ScriptVal->"name")) ($ScriptVal->"name");
+  }
 
-:foreach Order,Script in=$RunOrder do={
-  :do {
-    $LogPrintExit2 debug $0 ("Running script with order " . $Order . ": " . $Script) false;
-    /system/script/run $Script;
-  } on-error={
-    $LogPrintExit2 warning $0 ("Running script '" . $Script . "' failed!") false;
+  :foreach Order,Script in=$RunOrder do={
+    :do {
+      $LogPrint debug $ScriptName ("Running script with order " . $Order . ": " . $Script);
+      /system/script/run $Script;
+    } on-error={
+      $LogPrint warning $ScriptName ("Running script '" . $Script . "' failed!");
+    }
   }
+} on-error={
+  :global ExitError; $ExitError $ExitOK [ :jobname ];
 }