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

---
 daily-psk.capsman.rsc  | 10 ++++------
 daily-psk.local.rsc    | 10 ++++------
 daily-psk.template.rsc | 10 ++++------
 daily-psk.wifi.rsc     | 10 ++++------
 4 files changed, 16 insertions(+), 24 deletions(-)

diff --git a/daily-psk.capsman.rsc b/daily-psk.capsman.rsc
index 85e05b6..c9c0186 100644
--- a/daily-psk.capsman.rsc
+++ b/daily-psk.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 DailyPskMatchComment;
   :global DailyPskQrCodeUrl;
@@ -31,7 +31,7 @@
   :global WaitFullyConnected;
 
   :if ([ $ScriptLock $ScriptName ] = false) do={
-    :return false;
+    :error false;
   }
   $WaitFullyConnected;
 
@@ -89,6 +89,4 @@
       }
     }
   }
-}
-
-$Main [ :jobname ];
+} on-error={ }
diff --git a/daily-psk.local.rsc b/daily-psk.local.rsc
index 108c711..228efc8 100644
--- a/daily-psk.local.rsc
+++ b/daily-psk.local.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 DailyPskMatchComment;
   :global DailyPskQrCodeUrl;
@@ -31,7 +31,7 @@
   :global WaitFullyConnected;
 
   :if ([ $ScriptLock $ScriptName ] = false) do={
-    :return false;
+    :error false;
   }
   $WaitFullyConnected;
 
@@ -88,6 +88,4 @@
       }
     }
   }
-}
-
-$Main [ :jobname ];
+} on-error={ }
diff --git a/daily-psk.template.rsc b/daily-psk.template.rsc
index c45f34a..4403fe6 100644
--- a/daily-psk.template.rsc
+++ b/daily-psk.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 DailyPskMatchComment;
   :global DailyPskQrCodeUrl;
@@ -32,7 +32,7 @@
   :global WaitFullyConnected;
 
   :if ([ $ScriptLock $ScriptName ] = false) do={
-    :return false;
+    :error false;
   }
   $WaitFullyConnected;
 
@@ -104,6 +104,4 @@
       }
     }
   }
-}
-
-$Main [ :jobname ];
+} on-error={ }
diff --git a/daily-psk.wifi.rsc b/daily-psk.wifi.rsc
index 0ba22ab..e9b5199 100644
--- a/daily-psk.wifi.rsc
+++ b/daily-psk.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 DailyPskMatchComment;
   :global DailyPskQrCodeUrl;
@@ -31,7 +31,7 @@
   :global WaitFullyConnected;
 
   :if ([ $ScriptLock $ScriptName ] = false) do={
-    :return false;
+    :error false;
   }
   $WaitFullyConnected;
 
@@ -89,6 +89,4 @@
       }
     }
   }
-}
-
-$Main [ :jobname ];
+} on-error={ }
-- 
cgit v1.2.3-70-g09d2