From b622f47d6566d2049f95f17c787f1b3ee2b103b4 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Wed, 6 Mar 2024 15:28:55 +0100
Subject: hotspot-to-wpa-cleanup: drop main function, use :do with on-error

---
 hotspot-to-wpa-cleanup.capsman.rsc  | 10 ++++------
 hotspot-to-wpa-cleanup.template.rsc | 10 ++++------
 hotspot-to-wpa-cleanup.wifi.rsc     | 10 ++++------
 3 files changed, 12 insertions(+), 18 deletions(-)

diff --git a/hotspot-to-wpa-cleanup.capsman.rsc b/hotspot-to-wpa-cleanup.capsman.rsc
index 62beacc..ba74260 100644
--- a/hotspot-to-wpa-cleanup.capsman.rsc
+++ b/hotspot-to-wpa-cleanup.capsman.rsc
@@ -14,8 +14,8 @@
 :global GlobalFunctionsReady;
 :while ($GlobalFunctionsReady != true) do={ :delay 500ms; }
 
-:local Main do={
-  :local ScriptName [ :tostr $1 ];
+:do {
+  :local ScriptName [ :jobname ];
 
   :global EitherOr;
   :global LogPrintExit2;
@@ -23,7 +23,7 @@
   :global ScriptLock;
 
   :if ([ $ScriptLock $ScriptName 10 ] = false) do={
-    :return false;
+    :error false;
   }
 
   :local DHCPServers ({});
@@ -71,6 +71,4 @@
       /ip/dhcp-server/lease/remove $Lease;
     }
   }
-}
-
-$Main [ :jobname ];
+} on-error={ }
diff --git a/hotspot-to-wpa-cleanup.template.rsc b/hotspot-to-wpa-cleanup.template.rsc
index bba9f0e..c46d75d 100644
--- a/hotspot-to-wpa-cleanup.template.rsc
+++ b/hotspot-to-wpa-cleanup.template.rsc
@@ -15,8 +15,8 @@
 :global GlobalFunctionsReady;
 :while ($GlobalFunctionsReady != true) do={ :delay 500ms; }
 
-:local Main do={
-  :local ScriptName [ :tostr $1 ];
+:do {
+  :local ScriptName [ :jobname ];
 
   :global EitherOr;
   :global LogPrintExit2;
@@ -24,7 +24,7 @@
   :global ScriptLock;
 
   :if ([ $ScriptLock $ScriptName 10 ] = false) do={
-    :return false;
+    :error false;
   }
 
   :local DHCPServers ({});
@@ -78,6 +78,4 @@
       /ip/dhcp-server/lease/remove $Lease;
     }
   }
-}
-
-$Main [ :jobname ];
+} on-error={ }
diff --git a/hotspot-to-wpa-cleanup.wifi.rsc b/hotspot-to-wpa-cleanup.wifi.rsc
index a44064f..3e5799a 100644
--- a/hotspot-to-wpa-cleanup.wifi.rsc
+++ b/hotspot-to-wpa-cleanup.wifi.rsc
@@ -14,8 +14,8 @@
 :global GlobalFunctionsReady;
 :while ($GlobalFunctionsReady != true) do={ :delay 500ms; }
 
-:local Main do={
-  :local ScriptName [ :tostr $1 ];
+:do {
+  :local ScriptName [ :jobname ];
 
   :global EitherOr;
   :global LogPrintExit2;
@@ -23,7 +23,7 @@
   :global ScriptLock;
 
   :if ([ $ScriptLock $ScriptName 10 ] = false) do={
-    :return false;
+    :error false;
   }
 
   :local DHCPServers ({});
@@ -71,6 +71,4 @@
       /ip/dhcp-server/lease/remove $Lease;
     }
   }
-}
-
-$Main [ :jobname ];
+} on-error={ }
-- 
cgit v1.2.3-54-g00ecf