From ccfe1a781edc2990575cca57d49582e7e046d960 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Tue, 6 May 2025 09:25:28 +0200
Subject: [PATCH 001/129] check-routeros-update: log and print info with
 scheduler

---
 check-routeros-update.rsc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/check-routeros-update.rsc b/check-routeros-update.rsc
index 361be34e..1b68d5af 100644
--- a/check-routeros-update.rsc
+++ b/check-routeros-update.rsc
@@ -62,8 +62,9 @@
   $WaitFullyConnected;
 
   :if ([ :len [ /system/scheduler/find where name="_RebootForUpdate" ] ] > 0) do={
+    $LogPrint info $ScriptName ("A reboot for update is already scheduled.");
     :set ExitOK true;
-    :error "A reboot for update is already scheduled.";
+    :error false;
   }
 
   $LogPrint debug $ScriptName ("Checking for updates...");

From 90f61d3d75bccb8f8892dc7190ec325ccc7d940f Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Tue, 6 May 2025 09:17:26 +0200
Subject: [PATCH 002/129] global-functions: $ExitError: support to pass in
 error message

---
 global-functions.rsc | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/global-functions.rsc b/global-functions.rsc
index 71aa7de3..17b36741 100644
--- a/global-functions.rsc
+++ b/global-functions.rsc
@@ -452,13 +452,15 @@
 :set ExitError do={
   :local ExitOK [ :tostr $1 ];
   :local Name   [ :tostr $2 ];
+  :local Error  [ :tostr $3 ];
 
   :global IfThenElse;
   :global LogPrint; 
 
   :if ($ExitOK = "false") do={
     $LogPrint error $Name ([ $IfThenElse ([ :pick $Name 0 1 ] = "\$") \
-        "Function" "Script" ] . " '" . $Name . "' exited with error.");
+        "Function" "Script" ] . " '" . $Name . "' exited with error" . \
+        [ $IfThenElse (!($Error ~ "^(|true|false)\$")) (": " . $Error) "." ]);
   }
 }
 

From 41bf9677db821c1d2c2479dc4f6f8b8740f3bdbe Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Tue, 6 May 2025 09:49:49 +0200
Subject: [PATCH 003/129] global-functions: use :onerror for outer block

---
 global-functions.rsc | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/global-functions.rsc b/global-functions.rsc
index 17b36741..29e6d06b 100644
--- a/global-functions.rsc
+++ b/global-functions.rsc
@@ -1119,7 +1119,7 @@
 }
 
 # install new scripts, update existing scripts
-:set ScriptInstallUpdate do={ :do {
+:set ScriptInstallUpdate do={ :onerror Err {
   :local Scripts    [ :toarray $1 ];
   :local NewComment [ :tostr   $2 ];
 
@@ -1396,8 +1396,8 @@
     :set GlobalConfigChanges;
     :set GlobalConfigMigration;
   }
-} on-error={
-  :global ExitError; $ExitError false $0;
+} do={
+  :global ExitError; $ExitError false $0 $Err;
 } }
 
 # lock script against multiple invocation
@@ -1538,12 +1538,12 @@
 }
 
 # send notification via NotificationFunctions - expects at least two string arguments
-:set SendNotification do={ :do {
+:set SendNotification do={ :onerror Err {
   :global SendNotification2;
 
   $SendNotification2 ({ origin=$0; subject=$1; message=$2; link=$3; silent=$4 });
-} on-error={
-  :global ExitError; $ExitError false $0;
+} do={
+  :global ExitError; $ExitError false $0 $Err;
 } }
 
 # send notification via NotificationFunctions - expects one array argument

From b9faeb86b98cc1667f0591dfd34ca43dbd6a718b Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Tue, 6 May 2025 09:44:23 +0200
Subject: [PATCH 004/129] accesslist-duplicates: use :onerror for outer block

---
 accesslist-duplicates.capsman.rsc  | 6 +++---
 accesslist-duplicates.local.rsc    | 6 +++---
 accesslist-duplicates.template.rsc | 6 +++---
 accesslist-duplicates.wifi.rsc     | 6 +++---
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/accesslist-duplicates.capsman.rsc b/accesslist-duplicates.capsman.rsc
index 27546c8d..c0967541 100644
--- a/accesslist-duplicates.capsman.rsc
+++ b/accesslist-duplicates.capsman.rsc
@@ -14,7 +14,7 @@
 :while ($GlobalFunctionsReady != true) do={ :delay 500ms; }
 
 :local ExitOK false;
-:do {
+:onerror Err {
   :local ScriptName [ :jobname ];
 
   :local Seen ({});
@@ -32,6 +32,6 @@
     }
     :set ($Seen->$Mac) 1;
   }
-} on-error={
-  :global ExitError; $ExitError $ExitOK [ :jobname ];
+} do={
+  :global ExitError; $ExitError $ExitOK [ :jobname ] $Err;
 }
diff --git a/accesslist-duplicates.local.rsc b/accesslist-duplicates.local.rsc
index 589815d6..6f2d1205 100644
--- a/accesslist-duplicates.local.rsc
+++ b/accesslist-duplicates.local.rsc
@@ -14,7 +14,7 @@
 :while ($GlobalFunctionsReady != true) do={ :delay 500ms; }
 
 :local ExitOK false;
-:do {
+:onerror Err {
   :local ScriptName [ :jobname ];
 
   :local Seen ({});
@@ -32,6 +32,6 @@
     }
     :set ($Seen->$Mac) 1;
   }
-} on-error={
-  :global ExitError; $ExitError $ExitOK [ :jobname ];
+} do={
+  :global ExitError; $ExitError $ExitOK [ :jobname ] $Err;
 }
diff --git a/accesslist-duplicates.template.rsc b/accesslist-duplicates.template.rsc
index ccbca3df..b08f2adb 100644
--- a/accesslist-duplicates.template.rsc
+++ b/accesslist-duplicates.template.rsc
@@ -15,7 +15,7 @@
 :while ($GlobalFunctionsReady != true) do={ :delay 500ms; }
 
 :local ExitOK false;
-:do {
+:onerror Err {
   :local ScriptName [ :jobname ];
 
   :local Seen ({});
@@ -41,6 +41,6 @@
     }
     :set ($Seen->$Mac) 1;
   }
-} on-error={
-  :global ExitError; $ExitError $ExitOK [ :jobname ];
+} do={
+  :global ExitError; $ExitError $ExitOK [ :jobname ] $Err;
 }
diff --git a/accesslist-duplicates.wifi.rsc b/accesslist-duplicates.wifi.rsc
index 527ebb4b..ccd04f5d 100644
--- a/accesslist-duplicates.wifi.rsc
+++ b/accesslist-duplicates.wifi.rsc
@@ -14,7 +14,7 @@
 :while ($GlobalFunctionsReady != true) do={ :delay 500ms; }
 
 :local ExitOK false;
-:do {
+:onerror Err {
   :local ScriptName [ :jobname ];
 
   :local Seen ({});
@@ -32,6 +32,6 @@
     }
     :set ($Seen->$Mac) 1;
   }
-} on-error={
-  :global ExitError; $ExitError $ExitOK [ :jobname ];
+} do={
+  :global ExitError; $ExitError $ExitOK [ :jobname ] $Err;
 }

From 02a205b14ecec27f535b0453c012e27a03c2a6ed Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Tue, 6 May 2025 09:44:23 +0200
Subject: [PATCH 005/129] backup-cloud: use :onerror for outer block

---
 backup-cloud.rsc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/backup-cloud.rsc b/backup-cloud.rsc
index c4e23b2a..bc09aac2 100644
--- a/backup-cloud.rsc
+++ b/backup-cloud.rsc
@@ -13,7 +13,7 @@
 :while ($GlobalFunctionsReady != true) do={ :delay 500ms; }
 
 :local ExitOK false;
-:do {
+:onerror Err {
   :local ScriptName [ :jobname ];
 
   :global BackupRandomDelay;
@@ -99,6 +99,6 @@
     :set PackagesUpdateBackupFailure true;
   }
   $RmDir "tmpfs/backup-cloud";
-} on-error={
-  :global ExitError; $ExitError $ExitOK [ :jobname ];
+} do={
+  :global ExitError; $ExitError $ExitOK [ :jobname ] $Err;
 }

From 953daca8ac06c01050057f1e14e2020a58116f50 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Tue, 6 May 2025 09:44:23 +0200
Subject: [PATCH 006/129] backup-email: use :onerror for outer block

---
 backup-email.rsc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/backup-email.rsc b/backup-email.rsc
index d0973011..95f25109 100644
--- a/backup-email.rsc
+++ b/backup-email.rsc
@@ -13,7 +13,7 @@
 :while ($GlobalFunctionsReady != true) do={ :delay 500ms; }
 
 :local ExitOK false;
-:do {
+:onerror Err {
   :local ScriptName [ :jobname ];
 
   :global BackupPassword;
@@ -135,6 +135,6 @@
     :delay 1s;
     :set I ($I + 1);
   }
-} on-error={
-  :global ExitError; $ExitError $ExitOK [ :jobname ];
+} do={
+  :global ExitError; $ExitError $ExitOK [ :jobname ] $Err;
 }

From 34c052c5f14da6d9a68861f26b383594ee61bcb4 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Tue, 6 May 2025 09:44:23 +0200
Subject: [PATCH 007/129] backup-partition: use :onerror for outer block

---
 backup-partition.rsc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/backup-partition.rsc b/backup-partition.rsc
index 1f0cf2ee..42f77904 100644
--- a/backup-partition.rsc
+++ b/backup-partition.rsc
@@ -14,7 +14,7 @@
 :while ($GlobalFunctionsReady != true) do={ :delay 500ms; }
 
 :local ExitOK false;
-:do {
+:onerror Err {
   :local ScriptName [ :jobname ];
 
   :global BackupPartitionCopyBeforeFeatureUpdate;
@@ -121,6 +121,6 @@
     :set ExitOK true;
     :error false;
   }
-} on-error={
-  :global ExitError; $ExitError $ExitOK [ :jobname ];
+} do={
+  :global ExitError; $ExitError $ExitOK [ :jobname ] $Err;
 }

From 0a9acab0405fc5ec5081e6f423c04e26c1847cac Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Tue, 6 May 2025 09:44:23 +0200
Subject: [PATCH 008/129] backup-upload: use :onerror for outer block

---
 backup-upload.rsc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/backup-upload.rsc b/backup-upload.rsc
index 14c39141..945659a0 100644
--- a/backup-upload.rsc
+++ b/backup-upload.rsc
@@ -14,7 +14,7 @@
 :while ($GlobalFunctionsReady != true) do={ :delay 500ms; }
 
 :local ExitOK false;
-:do {
+:onerror Err {
   :local ScriptName [ :jobname ];
 
   :global BackupPassword;
@@ -173,6 +173,6 @@
     :set PackagesUpdateBackupFailure true;
   }
   $RmDir $DirName;
-} on-error={
-  :global ExitError; $ExitError $ExitOK [ :jobname ];
+} do={
+  :global ExitError; $ExitError $ExitOK [ :jobname ] $Err;
 }

From e0ba2c8282be0af1a1f43a5ebd51fb5848c955b9 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Tue, 6 May 2025 09:44:23 +0200
Subject: [PATCH 009/129] capsman-download-packages: use :onerror for outer
 block

---
 capsman-download-packages.capsman.rsc  | 6 +++---
 capsman-download-packages.template.rsc | 6 +++---
 capsman-download-packages.wifi.rsc     | 6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/capsman-download-packages.capsman.rsc b/capsman-download-packages.capsman.rsc
index 25c43f58..688f7041 100644
--- a/capsman-download-packages.capsman.rsc
+++ b/capsman-download-packages.capsman.rsc
@@ -15,7 +15,7 @@
 :while ($GlobalFunctionsReady != true) do={ :delay 500ms; }
 
 :local ExitOK false;
-:do {
+:onerror Err {
   :local ScriptName [ :jobname ];
 
   :global CleanFilePath;
@@ -87,6 +87,6 @@
       /caps-man/remote-cap/upgrade [ find where version!=$InstalledVersion ];
     }
   }
-} on-error={
-  :global ExitError; $ExitError $ExitOK [ :jobname ];
+} do={
+  :global ExitError; $ExitError $ExitOK [ :jobname ] $Err;
 }
diff --git a/capsman-download-packages.template.rsc b/capsman-download-packages.template.rsc
index b2698382..12506ead 100644
--- a/capsman-download-packages.template.rsc
+++ b/capsman-download-packages.template.rsc
@@ -16,7 +16,7 @@
 :while ($GlobalFunctionsReady != true) do={ :delay 500ms; }
 
 :local ExitOK false;
-:do {
+:onerror Err {
   :local ScriptName [ :jobname ];
 
   :global CleanFilePath;
@@ -98,6 +98,6 @@
       /interface/wifi/capsman/remote-cap/upgrade [ find where version!=$InstalledVersion ];
     }
   }
-} on-error={
-  :global ExitError; $ExitError $ExitOK [ :jobname ];
+} do={
+  :global ExitError; $ExitError $ExitOK [ :jobname ] $Err;
 }
diff --git a/capsman-download-packages.wifi.rsc b/capsman-download-packages.wifi.rsc
index 901bb0af..78238ef3 100644
--- a/capsman-download-packages.wifi.rsc
+++ b/capsman-download-packages.wifi.rsc
@@ -15,7 +15,7 @@
 :while ($GlobalFunctionsReady != true) do={ :delay 500ms; }
 
 :local ExitOK false;
-:do {
+:onerror Err {
   :local ScriptName [ :jobname ];
 
   :global CleanFilePath;
@@ -89,6 +89,6 @@
       /interface/wifi/capsman/remote-cap/upgrade [ find where version!=$InstalledVersion ];
     }
   }
-} on-error={
-  :global ExitError; $ExitError $ExitOK [ :jobname ];
+} do={
+  :global ExitError; $ExitError $ExitOK [ :jobname ] $Err;
 }

From 54a3012e89a4b377a1f5f1ac9435b7d3a8912ec1 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Tue, 6 May 2025 09:44:23 +0200
Subject: [PATCH 010/129] capsman-rolling-upgrade: use :onerror for outer block

---
 capsman-rolling-upgrade.capsman.rsc  | 6 +++---
 capsman-rolling-upgrade.template.rsc | 6 +++---
 capsman-rolling-upgrade.wifi.rsc     | 6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/capsman-rolling-upgrade.capsman.rsc b/capsman-rolling-upgrade.capsman.rsc
index 791b3dbb..813b8e59 100644
--- a/capsman-rolling-upgrade.capsman.rsc
+++ b/capsman-rolling-upgrade.capsman.rsc
@@ -16,7 +16,7 @@
 :while ($GlobalFunctionsReady != true) do={ :delay 500ms; }
 
 :local ExitOK false;
-:do {
+:onerror Err {
   :local ScriptName [ :jobname ];
 
   :global LogPrint;
@@ -45,6 +45,6 @@
       :delay ($Delay . "s");
     }
   }
-} on-error={
-  :global ExitError; $ExitError $ExitOK [ :jobname ];
+} do={
+  :global ExitError; $ExitError $ExitOK [ :jobname ] $Err;
 }
diff --git a/capsman-rolling-upgrade.template.rsc b/capsman-rolling-upgrade.template.rsc
index 0b1cc2ba..355926da 100644
--- a/capsman-rolling-upgrade.template.rsc
+++ b/capsman-rolling-upgrade.template.rsc
@@ -17,7 +17,7 @@
 :while ($GlobalFunctionsReady != true) do={ :delay 500ms; }
 
 :local ExitOK false;
-:do {
+:onerror Err {
   :local ScriptName [ :jobname ];
 
   :global LogPrint;
@@ -53,6 +53,6 @@
       :delay ($Delay . "s");
     }
   }
-} on-error={
-  :global ExitError; $ExitError $ExitOK [ :jobname ];
+} do={
+  :global ExitError; $ExitError $ExitOK [ :jobname ] $Err;
 }
diff --git a/capsman-rolling-upgrade.wifi.rsc b/capsman-rolling-upgrade.wifi.rsc
index 4afdee2e..3d5c801f 100644
--- a/capsman-rolling-upgrade.wifi.rsc
+++ b/capsman-rolling-upgrade.wifi.rsc
@@ -16,7 +16,7 @@
 :while ($GlobalFunctionsReady != true) do={ :delay 500ms; }
 
 :local ExitOK false;
-:do {
+:onerror Err {
   :local ScriptName [ :jobname ];
 
   :global LogPrint;
@@ -46,6 +46,6 @@
       :delay ($Delay . "s");
     }
   }
-} on-error={
-  :global ExitError; $ExitError $ExitOK [ :jobname ];
+} do={
+  :global ExitError; $ExitError $ExitOK [ :jobname ] $Err;
 }

From 009516dbd4525126d688b26e189fa7f3be893f93 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Tue, 6 May 2025 09:44:23 +0200
Subject: [PATCH 011/129] certificate-renew-issued: use :onerror for outer
 block

---
 certificate-renew-issued.rsc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/certificate-renew-issued.rsc b/certificate-renew-issued.rsc
index 91a48dea..dc724b00 100644
--- a/certificate-renew-issued.rsc
+++ b/certificate-renew-issued.rsc
@@ -12,7 +12,7 @@
 :while ($GlobalFunctionsReady != true) do={ :delay 500ms; }
 
 :local ExitOK false;
-:do {
+:onerror Err {
   :local ScriptName [ :jobname ];
 
   :global CertIssuedExportPass;
@@ -47,6 +47,6 @@
       $LogPrint info $ScriptName ("Issued a new certificate for '" . $CertVal->"common-name" . "'.");
     }
   }
-} on-error={
-  :global ExitError; $ExitError $ExitOK [ :jobname ];
+} do={
+  :global ExitError; $ExitError $ExitOK [ :jobname ] $Err;
 }

From e44a5384b7e21e0013746a1d06762d969d5b45d7 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Tue, 6 May 2025 09:44:23 +0200
Subject: [PATCH 012/129] check-certificates: use :onerror for outer block

---
 check-certificates.rsc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/check-certificates.rsc b/check-certificates.rsc
index be8e4dff..75a006eb 100644
--- a/check-certificates.rsc
+++ b/check-certificates.rsc
@@ -13,7 +13,7 @@
 :while ($GlobalFunctionsReady != true) do={ :delay 500ms; }
 
 :local ExitOK false;
-:do {
+:onerror Err {
   :local ScriptName [ :jobname ];
 
   :global CertRenewTime;
@@ -237,6 +237,6 @@
           ", it is invalid after " . ($CertVal->"invalid-after") . ".");
     }
   }
-} on-error={
-  :global ExitError; $ExitError $ExitOK [ :jobname ];
+} do={
+  :global ExitError; $ExitError $ExitOK [ :jobname ] $Err;
 }

From 051a1d95e5e1f5e90e79d505ef4bf542344cd64d Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Tue, 6 May 2025 09:44:23 +0200
Subject: [PATCH 013/129] check-health: use :onerror for outer block

---
 check-health.rsc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/check-health.rsc b/check-health.rsc
index f02a2491..75710a07 100644
--- a/check-health.rsc
+++ b/check-health.rsc
@@ -12,7 +12,7 @@
 :while ($GlobalFunctionsReady != true) do={ :delay 500ms; }
 
 :local ExitOK false;
-:do {
+:onerror Err {
   :local ScriptName [ :jobname ];
 
   :global CheckHealthCPUUtilization;
@@ -105,6 +105,6 @@
   }
 
   :set CheckHealthPlugins;
-} on-error={
-  :global ExitError; $ExitError $ExitOK [ :jobname ];
+} do={
+  :global ExitError; $ExitError $ExitOK [ :jobname ] $Err;
 }

From b959f2d941a87bd24e3495ca3d30a765200f8698 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Tue, 6 May 2025 09:44:23 +0200
Subject: [PATCH 014/129] check-lte-firmware-upgrade: use :onerror for outer
 block

---
 check-lte-firmware-upgrade.rsc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/check-lte-firmware-upgrade.rsc b/check-lte-firmware-upgrade.rsc
index c5b6cb56..f0b173fa 100644
--- a/check-lte-firmware-upgrade.rsc
+++ b/check-lte-firmware-upgrade.rsc
@@ -12,7 +12,7 @@
 :while ($GlobalFunctionsReady != true) do={ :delay 500ms; }
 
 :local ExitOK false;
-:do {
+:onerror Err {
   :local ScriptName [ :jobname ];
 
   :global SentLteFirmwareUpgradeNotification;
@@ -102,6 +102,6 @@
   :foreach Interface in=[ /interface/lte/find ] do={
     $CheckInterface $ScriptName $Interface;
   }
-} on-error={
-  :global ExitError; $ExitError $ExitOK [ :jobname ];
+} do={
+  :global ExitError; $ExitError $ExitOK [ :jobname ] $Err;
 }

From f5c33a9cfb367cf80b2bf34a924f95d6e124c454 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Tue, 6 May 2025 09:44:23 +0200
Subject: [PATCH 015/129] check-perpetual-license: use :onerror for outer block

---
 check-perpetual-license.rsc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/check-perpetual-license.rsc b/check-perpetual-license.rsc
index 9a3a3c74..7caa69aa 100644
--- a/check-perpetual-license.rsc
+++ b/check-perpetual-license.rsc
@@ -12,7 +12,7 @@
 :while ($GlobalFunctionsReady != true) do={ :delay 500ms; }
 
 :local ExitOK false;
-:do {
+:onerror Err {
   :local ScriptName [ :jobname ];
 
   :global Identity;
@@ -73,6 +73,6 @@
         ". It is now valid until " . ($License->"deadline-at") . ".") });
     :set SentCertificateNotification;
   }
-} on-error={
-  :global ExitError; $ExitError $ExitOK [ :jobname ];
+} do={
+  :global ExitError; $ExitError $ExitOK [ :jobname ] $Err;
 }

From 472dc9289dd1bf9309c17341bd996149ef0837d8 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Tue, 6 May 2025 09:44:23 +0200
Subject: [PATCH 016/129] check-routeros-update: use :onerror for outer block

---
 check-routeros-update.rsc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/check-routeros-update.rsc b/check-routeros-update.rsc
index 1b68d5af..ee7e5dac 100644
--- a/check-routeros-update.rsc
+++ b/check-routeros-update.rsc
@@ -13,7 +13,7 @@
 :while ($GlobalFunctionsReady != true) do={ :delay 500ms; }
 
 :local ExitOK false;
-:do {
+:onerror Err {
   :local ScriptName [ :jobname ];
 
   :global Identity;
@@ -214,6 +214,6 @@
       " is available for downgrade.");
     :set SentRouterosUpdateNotification ($Update->"latest-version");
   }
-} on-error={
-  :global ExitError; $ExitError $ExitOK [ :jobname ];
+} do={
+  :global ExitError; $ExitError $ExitOK [ :jobname ] $Err;
 }

From 7d8e9fda29f219471d8d68e1feb70e01e8d7e8dc Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Tue, 6 May 2025 09:44:23 +0200
Subject: [PATCH 017/129] collect-wireless-mac: use :onerror for outer block

---
 collect-wireless-mac.capsman.rsc  | 6 +++---
 collect-wireless-mac.local.rsc    | 6 +++---
 collect-wireless-mac.template.rsc | 6 +++---
 collect-wireless-mac.wifi.rsc     | 6 +++---
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/collect-wireless-mac.capsman.rsc b/collect-wireless-mac.capsman.rsc
index 17e09e3c..5cec9b90 100644
--- a/collect-wireless-mac.capsman.rsc
+++ b/collect-wireless-mac.capsman.rsc
@@ -15,7 +15,7 @@
 :while ($GlobalFunctionsReady != true) do={ :delay 500ms; }
 
 :local ExitOK false;
-:do {
+:onerror Err {
   :local ScriptName [ :jobname ];
 
   :global Identity;
@@ -95,6 +95,6 @@
       $LogPrint debug $ScriptName ("No mac address available... Ignoring.");
     }
   }
-} on-error={
-  :global ExitError; $ExitError $ExitOK [ :jobname ];
+} do={
+  :global ExitError; $ExitError $ExitOK [ :jobname ] $Err;
 }
diff --git a/collect-wireless-mac.local.rsc b/collect-wireless-mac.local.rsc
index 4a38bfa4..db75d69b 100644
--- a/collect-wireless-mac.local.rsc
+++ b/collect-wireless-mac.local.rsc
@@ -15,7 +15,7 @@
 :while ($GlobalFunctionsReady != true) do={ :delay 500ms; }
 
 :local ExitOK false;
-:do {
+:onerror Err {
   :local ScriptName [ :jobname ];
 
   :global Identity;
@@ -96,6 +96,6 @@
       $LogPrint debug $ScriptName ("No mac address available... Ignoring.");
     }
   }
-} on-error={
-  :global ExitError; $ExitError $ExitOK [ :jobname ];
+} do={
+  :global ExitError; $ExitError $ExitOK [ :jobname ] $Err;
 }
diff --git a/collect-wireless-mac.template.rsc b/collect-wireless-mac.template.rsc
index da901be2..144a8be1 100644
--- a/collect-wireless-mac.template.rsc
+++ b/collect-wireless-mac.template.rsc
@@ -16,7 +16,7 @@
 :while ($GlobalFunctionsReady != true) do={ :delay 500ms; }
 
 :local ExitOK false;
-:do {
+:onerror Err {
   :local ScriptName [ :jobname ];
 
   :global Identity;
@@ -113,6 +113,6 @@
       $LogPrint debug $ScriptName ("No mac address available... Ignoring.");
     }
   }
-} on-error={
-  :global ExitError; $ExitError $ExitOK [ :jobname ];
+} do={
+  :global ExitError; $ExitError $ExitOK [ :jobname ] $Err;
 }
diff --git a/collect-wireless-mac.wifi.rsc b/collect-wireless-mac.wifi.rsc
index cb217ce1..74f3ec6d 100644
--- a/collect-wireless-mac.wifi.rsc
+++ b/collect-wireless-mac.wifi.rsc
@@ -15,7 +15,7 @@
 :while ($GlobalFunctionsReady != true) do={ :delay 500ms; }
 
 :local ExitOK false;
-:do {
+:onerror Err {
   :local ScriptName [ :jobname ];
 
   :global Identity;
@@ -95,6 +95,6 @@
       $LogPrint debug $ScriptName ("No mac address available... Ignoring.");
     }
   }
-} on-error={
-  :global ExitError; $ExitError $ExitOK [ :jobname ];
+} do={
+  :global ExitError; $ExitError $ExitOK [ :jobname ] $Err;
 }

From 55e07a8a4223850c94e24706fcf929c2328415d2 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Tue, 6 May 2025 09:44:23 +0200
Subject: [PATCH 018/129] daily-psk: use :onerror for outer block

---
 daily-psk.capsman.rsc  | 6 +++---
 daily-psk.local.rsc    | 6 +++---
 daily-psk.template.rsc | 6 +++---
 daily-psk.wifi.rsc     | 6 +++---
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/daily-psk.capsman.rsc b/daily-psk.capsman.rsc
index 56729315..e4e7b8b1 100644
--- a/daily-psk.capsman.rsc
+++ b/daily-psk.capsman.rsc
@@ -15,7 +15,7 @@
 :while ($GlobalFunctionsReady != true) do={ :delay 500ms; }
 
 :local ExitOK false;
-:do {
+:onerror Err {
   :local ScriptName [ :jobname ];
 
   :global DailyPskMatchComment;
@@ -91,6 +91,6 @@
       }
     }
   }
-} on-error={
-  :global ExitError; $ExitError $ExitOK [ :jobname ];
+} do={
+  :global ExitError; $ExitError $ExitOK [ :jobname ] $Err;
 }
diff --git a/daily-psk.local.rsc b/daily-psk.local.rsc
index 9dea4692..efea9b50 100644
--- a/daily-psk.local.rsc
+++ b/daily-psk.local.rsc
@@ -15,7 +15,7 @@
 :while ($GlobalFunctionsReady != true) do={ :delay 500ms; }
 
 :local ExitOK false;
-:do {
+:onerror Err {
   :local ScriptName [ :jobname ];
 
   :global DailyPskMatchComment;
@@ -90,6 +90,6 @@
       }
     }
   }
-} on-error={
-  :global ExitError; $ExitError $ExitOK [ :jobname ];
+} do={
+  :global ExitError; $ExitError $ExitOK [ :jobname ] $Err;
 }
diff --git a/daily-psk.template.rsc b/daily-psk.template.rsc
index 8202eeba..5944c743 100644
--- a/daily-psk.template.rsc
+++ b/daily-psk.template.rsc
@@ -16,7 +16,7 @@
 :while ($GlobalFunctionsReady != true) do={ :delay 500ms; }
 
 :local ExitOK false;
-:do {
+:onerror Err {
   :local ScriptName [ :jobname ];
 
   :global DailyPskMatchComment;
@@ -106,6 +106,6 @@
       }
     }
   }
-} on-error={
-  :global ExitError; $ExitError $ExitOK [ :jobname ];
+} do={
+  :global ExitError; $ExitError $ExitOK [ :jobname ] $Err;
 }
diff --git a/daily-psk.wifi.rsc b/daily-psk.wifi.rsc
index 3de3c5b6..050e9c27 100644
--- a/daily-psk.wifi.rsc
+++ b/daily-psk.wifi.rsc
@@ -15,7 +15,7 @@
 :while ($GlobalFunctionsReady != true) do={ :delay 500ms; }
 
 :local ExitOK false;
-:do {
+:onerror Err {
   :local ScriptName [ :jobname ];
 
   :global DailyPskMatchComment;
@@ -91,6 +91,6 @@
       }
     }
   }
-} on-error={
-  :global ExitError; $ExitError $ExitOK [ :jobname ];
+} do={
+  :global ExitError; $ExitError $ExitOK [ :jobname ] $Err;
 }

From 5dc6b712e187af1e84b75d7e497ad7f50ca1bad7 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Tue, 6 May 2025 09:44:23 +0200
Subject: [PATCH 019/129] dhcp-lease-comment: use :onerror for outer block

---
 dhcp-lease-comment.capsman.rsc  | 6 +++---
 dhcp-lease-comment.local.rsc    | 6 +++---
 dhcp-lease-comment.template.rsc | 6 +++---
 dhcp-lease-comment.wifi.rsc     | 6 +++---
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/dhcp-lease-comment.capsman.rsc b/dhcp-lease-comment.capsman.rsc
index 36b31c85..92495c91 100644
--- a/dhcp-lease-comment.capsman.rsc
+++ b/dhcp-lease-comment.capsman.rsc
@@ -15,7 +15,7 @@
 :while ($GlobalFunctionsReady != true) do={ :delay 500ms; }
 
 :local ExitOK false;
-:do {
+:onerror Err {
   :local ScriptName [ :jobname ];
 
   :global LogPrint;
@@ -38,6 +38,6 @@
       /ip/dhcp-server/lease/set comment=$NewComment $Lease;
     }
   }
-} on-error={
-  :global ExitError; $ExitError $ExitOK [ :jobname ];
+} do={
+  :global ExitError; $ExitError $ExitOK [ :jobname ] $Err;
 }
diff --git a/dhcp-lease-comment.local.rsc b/dhcp-lease-comment.local.rsc
index 35dc6f68..07802bc2 100644
--- a/dhcp-lease-comment.local.rsc
+++ b/dhcp-lease-comment.local.rsc
@@ -15,7 +15,7 @@
 :while ($GlobalFunctionsReady != true) do={ :delay 500ms; }
 
 :local ExitOK false;
-:do {
+:onerror Err {
   :local ScriptName [ :jobname ];
 
   :global LogPrint;
@@ -38,6 +38,6 @@
       /ip/dhcp-server/lease/set comment=$NewComment $Lease;
     }
   }
-} on-error={
-  :global ExitError; $ExitError $ExitOK [ :jobname ];
+} do={
+  :global ExitError; $ExitError $ExitOK [ :jobname ] $Err;
 }
diff --git a/dhcp-lease-comment.template.rsc b/dhcp-lease-comment.template.rsc
index 47a85542..814e1d7c 100644
--- a/dhcp-lease-comment.template.rsc
+++ b/dhcp-lease-comment.template.rsc
@@ -16,7 +16,7 @@
 :while ($GlobalFunctionsReady != true) do={ :delay 500ms; }
 
 :local ExitOK false;
-:do {
+:onerror Err {
   :local ScriptName [ :jobname ];
 
   :global LogPrint;
@@ -43,6 +43,6 @@
       /ip/dhcp-server/lease/set comment=$NewComment $Lease;
     }
   }
-} on-error={
-  :global ExitError; $ExitError $ExitOK [ :jobname ];
+} do={
+  :global ExitError; $ExitError $ExitOK [ :jobname ] $Err;
 }
diff --git a/dhcp-lease-comment.wifi.rsc b/dhcp-lease-comment.wifi.rsc
index e0f97851..92fb6b00 100644
--- a/dhcp-lease-comment.wifi.rsc
+++ b/dhcp-lease-comment.wifi.rsc
@@ -15,7 +15,7 @@
 :while ($GlobalFunctionsReady != true) do={ :delay 500ms; }
 
 :local ExitOK false;
-:do {
+:onerror Err {
   :local ScriptName [ :jobname ];
 
   :global LogPrint;
@@ -38,6 +38,6 @@
       /ip/dhcp-server/lease/set comment=$NewComment $Lease;
     }
   }
-} on-error={
-  :global ExitError; $ExitError $ExitOK [ :jobname ];
+} do={
+  :global ExitError; $ExitError $ExitOK [ :jobname ] $Err;
 }

From 8ed83a311d3b9140b01c2dd5064f59ad4bcc3955 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Tue, 6 May 2025 09:44:23 +0200
Subject: [PATCH 020/129] dhcp-to-dns: use :onerror for outer block

---
 dhcp-to-dns.rsc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/dhcp-to-dns.rsc b/dhcp-to-dns.rsc
index 9b940984..b032071f 100644
--- a/dhcp-to-dns.rsc
+++ b/dhcp-to-dns.rsc
@@ -13,7 +13,7 @@
 :while ($GlobalFunctionsReady != true) do={ :delay 500ms; }
 
 :local ExitOK false;
-:do {
+:onerror Err {
   :local ScriptName [ :jobname ];
 
   :global Domain;
@@ -125,6 +125,6 @@
       $LogPrint debug $ScriptName ("No address available... Ignoring.");
     }
   }
-} on-error={
-  :global ExitError; $ExitError $ExitOK [ :jobname ];
+} do={
+  :global ExitError; $ExitError $ExitOK [ :jobname ] $Err;
 }

From d99380443b1607389d107bf0fbc4182168a4d8b0 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Tue, 6 May 2025 09:44:23 +0200
Subject: [PATCH 021/129] firmware-upgrade-reboot: use :onerror for outer block

---
 firmware-upgrade-reboot.rsc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/firmware-upgrade-reboot.rsc b/firmware-upgrade-reboot.rsc
index 86a9a8c5..9c3ba76b 100644
--- a/firmware-upgrade-reboot.rsc
+++ b/firmware-upgrade-reboot.rsc
@@ -12,7 +12,7 @@
 :while ($GlobalFunctionsReady != true) do={ :delay 500ms; }
 
 :local ExitOK false;
-:do {
+:onerror Err {
   :local ScriptName [ :jobname ];
 
   :global LogPrint;
@@ -55,6 +55,6 @@
 
   $LogPrint info $ScriptName ("Firmware upgrade successful, rebooting.");
   /system/reboot;
-} on-error={
-  :global ExitError; $ExitError $ExitOK [ :jobname ];
+} do={
+  :global ExitError; $ExitError $ExitOK [ :jobname ] $Err;
 }

From 0e93d8ca665100a0db14b4191c494af51a238a35 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Tue, 6 May 2025 09:44:23 +0200
Subject: [PATCH 022/129] fw-addr-lists: use :onerror for outer block

---
 fw-addr-lists.rsc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/fw-addr-lists.rsc b/fw-addr-lists.rsc
index f0940fef..0fd79c1b 100644
--- a/fw-addr-lists.rsc
+++ b/fw-addr-lists.rsc
@@ -12,7 +12,7 @@
 :while ($GlobalFunctionsReady != true) do={ :delay 500ms; }
 
 :local ExitOK false;
-:do {
+:onerror Err {
   :local ScriptName [ :jobname ];
 
   :global FwAddrLists;
@@ -209,6 +209,6 @@
         " - renewed: " . [ $HumanReadableNum $CntRenew 1000 ] . \
         " - removed: " . [ $HumanReadableNum $CntRemove 1000 ]);
   }
-} on-error={
-  :global ExitError; $ExitError $ExitOK [ :jobname ];
+} do={
+  :global ExitError; $ExitError $ExitOK [ :jobname ] $Err;
 }

From d609da00416f95eb74e9742dbc0a981a5b9a41b5 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Tue, 6 May 2025 09:44:23 +0200
Subject: [PATCH 023/129] gps-track: use :onerror for outer block

---
 gps-track.rsc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gps-track.rsc b/gps-track.rsc
index dea56d2e..bd280c9b 100644
--- a/gps-track.rsc
+++ b/gps-track.rsc
@@ -13,7 +13,7 @@
 :while ($GlobalFunctionsReady != true) do={ :delay 500ms; }
 
 :local ExitOK false;
-:do {
+:onerror Err {
   :local ScriptName [ :jobname ];
 
   :global GpsTrackUrl;
@@ -48,6 +48,6 @@
   } else={
     $LogPrint debug $ScriptName ("GPS data not valid.");
   }
-} on-error={
-  :global ExitError; $ExitError $ExitOK [ :jobname ];
+} do={
+  :global ExitError; $ExitError $ExitOK [ :jobname ] $Err;
 }

From 143b8a8ddc2b30940333b95e09d23574076e48cb Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Tue, 6 May 2025 09:44:23 +0200
Subject: [PATCH 024/129] hotspot-to-wpa-cleanup: use :onerror for outer block

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

diff --git a/hotspot-to-wpa-cleanup.capsman.rsc b/hotspot-to-wpa-cleanup.capsman.rsc
index 033d0e73..6cd1bfbc 100644
--- a/hotspot-to-wpa-cleanup.capsman.rsc
+++ b/hotspot-to-wpa-cleanup.capsman.rsc
@@ -16,7 +16,7 @@
 :while ($GlobalFunctionsReady != true) do={ :delay 500ms; }
 
 :local ExitOK false;
-:do {
+:onerror Err {
   :local ScriptName [ :jobname ];
 
   :global EitherOr;
@@ -75,6 +75,6 @@
       /ip/dhcp-server/lease/remove $Lease;
     }
   }
-} on-error={
-  :global ExitError; $ExitError $ExitOK [ :jobname ];
+} do={
+  :global ExitError; $ExitError $ExitOK [ :jobname ] $Err;
 }
diff --git a/hotspot-to-wpa-cleanup.template.rsc b/hotspot-to-wpa-cleanup.template.rsc
index 0f8c490e..18d6beae 100644
--- a/hotspot-to-wpa-cleanup.template.rsc
+++ b/hotspot-to-wpa-cleanup.template.rsc
@@ -17,7 +17,7 @@
 :while ($GlobalFunctionsReady != true) do={ :delay 500ms; }
 
 :local ExitOK false;
-:do {
+:onerror Err {
   :local ScriptName [ :jobname ];
 
   :global EitherOr;
@@ -82,6 +82,6 @@
       /ip/dhcp-server/lease/remove $Lease;
     }
   }
-} on-error={
-  :global ExitError; $ExitError $ExitOK [ :jobname ];
+} do={
+  :global ExitError; $ExitError $ExitOK [ :jobname ] $Err;
 }
diff --git a/hotspot-to-wpa-cleanup.wifi.rsc b/hotspot-to-wpa-cleanup.wifi.rsc
index dfec697d..6348f74f 100644
--- a/hotspot-to-wpa-cleanup.wifi.rsc
+++ b/hotspot-to-wpa-cleanup.wifi.rsc
@@ -16,7 +16,7 @@
 :while ($GlobalFunctionsReady != true) do={ :delay 500ms; }
 
 :local ExitOK false;
-:do {
+:onerror Err {
   :local ScriptName [ :jobname ];
 
   :global EitherOr;
@@ -75,6 +75,6 @@
       /ip/dhcp-server/lease/remove $Lease;
     }
   }
-} on-error={
-  :global ExitError; $ExitError $ExitOK [ :jobname ];
+} do={
+  :global ExitError; $ExitError $ExitOK [ :jobname ] $Err;
 }

From 9ae733a1678577a96ba00a79de347a18c8cec319 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Tue, 6 May 2025 09:44:23 +0200
Subject: [PATCH 025/129] hotspot-to-wpa: use :onerror for outer block

---
 hotspot-to-wpa.capsman.rsc  | 6 +++---
 hotspot-to-wpa.template.rsc | 6 +++---
 hotspot-to-wpa.wifi.rsc     | 6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/hotspot-to-wpa.capsman.rsc b/hotspot-to-wpa.capsman.rsc
index 3f514750..54724cff 100644
--- a/hotspot-to-wpa.capsman.rsc
+++ b/hotspot-to-wpa.capsman.rsc
@@ -15,7 +15,7 @@
 :while ($GlobalFunctionsReady != true) do={ :delay 500ms; }
 
 :local ExitOK false;
-:do {
+:onerror Err {
   :local ScriptName [ :jobname ];
 
   :global EitherOr;
@@ -100,6 +100,6 @@
 
   :delay 2s;
   /caps-man/access-list/set $Entry action=accept;
-} on-error={
-  :global ExitError; $ExitError $ExitOK [ :jobname ];
+} do={
+  :global ExitError; $ExitError $ExitOK [ :jobname ] $Err;
 }
diff --git a/hotspot-to-wpa.template.rsc b/hotspot-to-wpa.template.rsc
index 068241d1..6764af9f 100644
--- a/hotspot-to-wpa.template.rsc
+++ b/hotspot-to-wpa.template.rsc
@@ -16,7 +16,7 @@
 :while ($GlobalFunctionsReady != true) do={ :delay 500ms; }
 
 :local ExitOK false;
-:do {
+:onerror Err {
   :local ScriptName [ :jobname ];
 
   :global EitherOr;
@@ -120,6 +120,6 @@
   :delay 2s;
   /caps-man/access-list/set $Entry action=accept;
   /interface/wifi/access-list/set $Entry action=accept;
-} on-error={
-  :global ExitError; $ExitError $ExitOK [ :jobname ];
+} do={
+  :global ExitError; $ExitError $ExitOK [ :jobname ] $Err;
 }
diff --git a/hotspot-to-wpa.wifi.rsc b/hotspot-to-wpa.wifi.rsc
index cc5e2fc6..e74081ae 100644
--- a/hotspot-to-wpa.wifi.rsc
+++ b/hotspot-to-wpa.wifi.rsc
@@ -15,7 +15,7 @@
 :while ($GlobalFunctionsReady != true) do={ :delay 500ms; }
 
 :local ExitOK false;
-:do {
+:onerror Err {
   :local ScriptName [ :jobname ];
 
   :global EitherOr;
@@ -97,6 +97,6 @@
 
   :delay 2s;
   /interface/wifi/access-list/set $Entry action=accept;
-} on-error={
-  :global ExitError; $ExitError $ExitOK [ :jobname ];
+} do={
+  :global ExitError; $ExitError $ExitOK [ :jobname ] $Err;
 }

From 1075b6b24e8875ced9da78f0a9c112283e345f21 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Tue, 6 May 2025 09:44:23 +0200
Subject: [PATCH 026/129] ipsec-to-dns: use :onerror for outer block

---
 ipsec-to-dns.rsc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ipsec-to-dns.rsc b/ipsec-to-dns.rsc
index 26dab0a2..a2739328 100644
--- a/ipsec-to-dns.rsc
+++ b/ipsec-to-dns.rsc
@@ -13,7 +13,7 @@
 :while ($GlobalFunctionsReady != true) do={ :delay 500ms; }
 
 :local ExitOK false;
-:do {
+:onerror Err {
   :local ScriptName [ :jobname ];
 
   :global Domain;
@@ -79,6 +79,6 @@
       /ip/dns/static/add name=$Fqdn address=($PeerVal->"dynamic-address") ttl=$Ttl comment=$Comment place-before=$PlaceBefore;
     }
   }
-} on-error={
-  :global ExitError; $ExitError $ExitOK [ :jobname ];
+} do={
+  :global ExitError; $ExitError $ExitOK [ :jobname ] $Err;
 }

From 39ab19b272160f85df034a5f71d4d5dd5748e962 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Tue, 6 May 2025 09:44:23 +0200
Subject: [PATCH 027/129] ipv6-update: use :onerror for outer block

---
 ipv6-update.rsc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ipv6-update.rsc b/ipv6-update.rsc
index 94bd1bc4..633919d3 100644
--- a/ipv6-update.rsc
+++ b/ipv6-update.rsc
@@ -12,7 +12,7 @@
 :while ($GlobalFunctionsReady != true) do={ :delay 500ms; }
 
 :local ExitOK false;
-:do {
+:onerror Err {
   :local ScriptName [ :jobname ];
 
   :global LogPrint;
@@ -102,6 +102,6 @@
       }
     }
   }
-} on-error={
-  :global ExitError; $ExitError $ExitOK [ :jobname ];
+} do={
+  :global ExitError; $ExitError $ExitOK [ :jobname ] $Err;
 }

From da9313801774c2f5d7c02d1b5bd3ac001e0be20f Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Tue, 6 May 2025 09:44:23 +0200
Subject: [PATCH 028/129] lease-script: use :onerror for outer block

---
 lease-script.rsc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lease-script.rsc b/lease-script.rsc
index bf27fda8..309337c7 100644
--- a/lease-script.rsc
+++ b/lease-script.rsc
@@ -12,7 +12,7 @@
 :while ($GlobalFunctionsReady != true) do={ :delay 500ms; }
 
 :local ExitOK false;
-:do {
+:onerror Err {
   :local ScriptName [ :jobname ];
 
   :global Grep;
@@ -60,6 +60,6 @@
       $LogPrint warning $ScriptName ("Running script '" . $Script . "' failed!");
     }
   }
-} on-error={
-  :global ExitError; $ExitError $ExitOK [ :jobname ];
+} do={
+  :global ExitError; $ExitError $ExitOK [ :jobname ] $Err;
 }

From c643069b3e77cca143f3f58ad10fe69c9eda69e2 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Tue, 6 May 2025 09:44:23 +0200
Subject: [PATCH 029/129] log-forward: use :onerror for outer block

---
 log-forward.rsc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/log-forward.rsc b/log-forward.rsc
index afeb3f29..0ce420f2 100644
--- a/log-forward.rsc
+++ b/log-forward.rsc
@@ -12,7 +12,7 @@
 :while ($GlobalFunctionsReady != true) do={ :delay 500ms; }
 
 :local ExitOK false;
-:do {
+:onerror Err {
   :local ScriptName [ :jobname ];
 
   :global Identity;
@@ -108,6 +108,6 @@
 
   :local LogAll [ /log/find ];
   :set LogForwardLast ($LogAll->([ :len $LogAll ] - 1) );
-} on-error={
-  :global ExitError; $ExitError $ExitOK [ :jobname ];
+} do={
+  :global ExitError; $ExitError $ExitOK [ :jobname ] $Err;
 }

From 7e530949d91f5b92ab4d5934225f24ae8793da2c Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Tue, 6 May 2025 09:44:23 +0200
Subject: [PATCH 030/129] mode-button: use :onerror for outer block

---
 mode-button.rsc | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/mode-button.rsc b/mode-button.rsc
index edc5f400..2b773bc2 100644
--- a/mode-button.rsc
+++ b/mode-button.rsc
@@ -13,7 +13,7 @@
 :while ($GlobalFunctionsReady != true) do={ :delay 500ms; }
 
 :local ExitOK false;
-:do {
+:onerror Err {
   :local ScriptName [ :jobname ];
 
   :global ModeButton;
@@ -83,7 +83,7 @@
         $LogPrint info $FuncName ("No action defined for " . $Count . " mode-button presses.");
       }
     } on-error={
-      :global ExitError; $ExitError false $0;
+      :global ExitError; $ExitError false $0 $Err;
     } }
     /system/scheduler/add name="_ModeButtonScheduler" \
         on-event=":global ModeButtonScheduler; \$ModeButtonScheduler;" interval=3s;
@@ -91,6 +91,6 @@
     $LogPrint debug $ScriptName ("Updating scheduler _ModeButtonScheduler...");
     /system/scheduler/set $Scheduler start-time=[ /system/clock/get time ];
   }
-} on-error={
-  :global ExitError; $ExitError $ExitOK [ :jobname ];
+} do={
+  :global ExitError; $ExitError $ExitOK [ :jobname ] $Err;
 }

From 3a123fef0fd42e285e6ba0f699d85dee68213387 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Tue, 6 May 2025 09:44:23 +0200
Subject: [PATCH 031/129] netwatch-dns: use :onerror for outer block

---
 netwatch-dns.rsc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/netwatch-dns.rsc b/netwatch-dns.rsc
index 467d6362..1d2d86b2 100644
--- a/netwatch-dns.rsc
+++ b/netwatch-dns.rsc
@@ -13,7 +13,7 @@
 :while ($GlobalFunctionsReady != true) do={ :delay 500ms; }
 
 :local ExitOK false;
-:do {
+:onerror Err {
   :local ScriptName [ :jobname ];
 
   :global CertificateAvailable;
@@ -145,6 +145,6 @@
       }
     }
   }
-} on-error={
-  :global ExitError; $ExitError $ExitOK [ :jobname ];
+} do={
+  :global ExitError; $ExitError $ExitOK [ :jobname ] $Err;
 }

From f7baf900ca86388717b54cf09224269675c053aa Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Tue, 6 May 2025 09:44:23 +0200
Subject: [PATCH 032/129] netwatch-notify: use :onerror for outer block

---
 netwatch-notify.rsc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/netwatch-notify.rsc b/netwatch-notify.rsc
index 0b8a8dc5..d256689a 100644
--- a/netwatch-notify.rsc
+++ b/netwatch-notify.rsc
@@ -12,7 +12,7 @@
 :while ($GlobalFunctionsReady != true) do={ :delay 500ms; }
 
 :local ExitOK false;
-:do {
+:onerror Err {
   :local ScriptName [ :jobname ];
 
   :global NetwatchNotify;
@@ -224,6 +224,6 @@
         "since"=($Metric->"since") };
     }
   }
-} on-error={
-  :global ExitError; $ExitError $ExitOK [ :jobname ];
+} do={
+  :global ExitError; $ExitError $ExitOK [ :jobname ] $Err;
 }

From 1a078b94a854c7e3adf24fa041e11423f11eccd8 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Tue, 6 May 2025 09:44:23 +0200
Subject: [PATCH 033/129] ospf-to-leds: use :onerror for outer block

---
 ospf-to-leds.rsc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ospf-to-leds.rsc b/ospf-to-leds.rsc
index a8662b32..e2f4dcf6 100644
--- a/ospf-to-leds.rsc
+++ b/ospf-to-leds.rsc
@@ -12,7 +12,7 @@
 :while ($GlobalFunctionsReady != true) do={ :delay 500ms; }
 
 :local ExitOK false;
-:do {
+:onerror Err {
   :local ScriptName [ :jobname ];
 
   :global LogPrint;
@@ -44,6 +44,6 @@
       /system/leds/set type=off [ find where leds=$LED ];
     }
   }
-} on-error={
-  :global ExitError; $ExitError $ExitOK [ :jobname ];
+} do={
+  :global ExitError; $ExitError $ExitOK [ :jobname ] $Err;
 }

From c53fc061561f7934ee10980ae3a41afa032b9102 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Tue, 6 May 2025 09:44:23 +0200
Subject: [PATCH 034/129] packages-update: use :onerror for outer block

---
 packages-update.rsc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages-update.rsc b/packages-update.rsc
index b11596ea..dce7cca4 100644
--- a/packages-update.rsc
+++ b/packages-update.rsc
@@ -13,7 +13,7 @@
 :while ($GlobalFunctionsReady != true) do={ :delay 500ms; }
 
 :local ExitOK false;
-:do {
+:onerror Err {
   :local ScriptName [ :jobname ];
 
   :global BackupRandomDelay;
@@ -163,6 +163,6 @@
   $LogPrint info $ScriptName ("Rebooting for update.");
   :delay 1s;
   /system/reboot;
-} on-error={
-  :global ExitError; $ExitError $ExitOK [ :jobname ];
+} do={
+  :global ExitError; $ExitError $ExitOK [ :jobname ] $Err;
 }

From 684cff7517828f1bd92a0eda7a96368b63906799 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Tue, 6 May 2025 09:44:23 +0200
Subject: [PATCH 035/129] ppp-on-up: use :onerror for outer block

---
 ppp-on-up.rsc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ppp-on-up.rsc b/ppp-on-up.rsc
index e09bd9d5..ffe3079c 100644
--- a/ppp-on-up.rsc
+++ b/ppp-on-up.rsc
@@ -12,7 +12,7 @@
 :while ($GlobalFunctionsReady != true) do={ :delay 500ms; }
 
 :local ExitOK false;
-:do {
+:onerror Err {
   :local ScriptName [ :jobname ];
 
   :global LogPrint;
@@ -39,6 +39,6 @@
       $LogPrint warning $ScriptName ("Running script '" . $ScriptName . "' failed!");
     }
   }
-} on-error={
-  :global ExitError; $ExitError $ExitOK [ :jobname ];
+} do={
+  :global ExitError; $ExitError $ExitOK [ :jobname ] $Err;
 }

From e905f8c9eac117dbfc4d83e04aab2de33cbf6d5a Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Tue, 6 May 2025 09:44:23 +0200
Subject: [PATCH 036/129] sms-action: use :onerror for outer block

---
 sms-action.rsc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/sms-action.rsc b/sms-action.rsc
index 3c8307a8..d5bd5531 100644
--- a/sms-action.rsc
+++ b/sms-action.rsc
@@ -12,7 +12,7 @@
 :while ($GlobalFunctionsReady != true) do={ :delay 500ms; }
 
 :local ExitOK false;
-:do {
+:onerror Err {
   :local ScriptName [ :jobname ];
 
   :global SmsAction;
@@ -36,6 +36,6 @@
   } else={
     $LogPrint warning $ScriptName ("The code for action '" . $Action . "' failed syntax validation!");
   }
-} on-error={
-  :global ExitError; $ExitError $ExitOK [ :jobname ];
+} do={
+  :global ExitError; $ExitError $ExitOK [ :jobname ] $Err;
 }

From 99b4c58f2c4e6f78c38f2cd156c91ef7d3e9de28 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Tue, 6 May 2025 09:44:23 +0200
Subject: [PATCH 037/129] sms-forward: use :onerror for outer block

---
 sms-forward.rsc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/sms-forward.rsc b/sms-forward.rsc
index 8169022c..ddaa3a8c 100644
--- a/sms-forward.rsc
+++ b/sms-forward.rsc
@@ -13,7 +13,7 @@
 :while ($GlobalFunctionsReady != true) do={ :delay 500ms; }
 
 :local ExitOK false;
-:do {
+:onerror Err {
   :local ScriptName [ :jobname ];
 
   :global Identity;
@@ -96,6 +96,6 @@
       }
     }
   }
-} on-error={
-  :global ExitError; $ExitError $ExitOK [ :jobname ];
+} do={
+  :global ExitError; $ExitError $ExitOK [ :jobname ] $Err;
 }

From ec6518155fd522bac96834989a21bf0ce50146ea Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Tue, 6 May 2025 09:44:23 +0200
Subject: [PATCH 038/129] telegram-chat: use :onerror for outer block

---
 telegram-chat.rsc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/telegram-chat.rsc b/telegram-chat.rsc
index 5db4860f..155bb023 100644
--- a/telegram-chat.rsc
+++ b/telegram-chat.rsc
@@ -13,7 +13,7 @@
 :while ($GlobalFunctionsReady != true) do={ :delay 500ms; }
 
 :local ExitOK false;
-:do {
+:onerror Err {
   :local ScriptName [ :jobname ];
 
   :global Identity;
@@ -190,6 +190,6 @@
   }
   :set TelegramChatOffset ([ :pick $TelegramChatOffset 1 3 ], \
     [ $IfThenElse ($UpdateID >= $TelegramChatOffset->2) ($UpdateID + 1) ($TelegramChatOffset->2) ]);
-} on-error={
-  :global ExitError; $ExitError $ExitOK [ :jobname ];
+} do={
+  :global ExitError; $ExitError $ExitOK [ :jobname ] $Err;
 }

From ea2f89011e456395af717f7c6c94f81edd0b0711 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Tue, 6 May 2025 09:44:23 +0200
Subject: [PATCH 039/129] update-gre-address: use :onerror for outer block

---
 update-gre-address.rsc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/update-gre-address.rsc b/update-gre-address.rsc
index cddfa92f..2570f80a 100644
--- a/update-gre-address.rsc
+++ b/update-gre-address.rsc
@@ -13,7 +13,7 @@
 :while ($GlobalFunctionsReady != true) do={ :delay 500ms; }
 
 :local ExitOK false;
-:do {
+:onerror Err {
   :local ScriptName [ :jobname ];
 
   :global CharacterReplace;
@@ -41,6 +41,6 @@
       }
     }
   }
-} on-error={
-  :global ExitError; $ExitError $ExitOK [ :jobname ];
+} do={
+  :global ExitError; $ExitError $ExitOK [ :jobname ] $Err;
 }

From af96e3218fa6347f9c6708110d8da0ee8ebe102f Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Tue, 6 May 2025 09:44:23 +0200
Subject: [PATCH 040/129] update-tunnelbroker: use :onerror for outer block

---
 update-tunnelbroker.rsc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/update-tunnelbroker.rsc b/update-tunnelbroker.rsc
index 45afa6f8..10adef0b 100644
--- a/update-tunnelbroker.rsc
+++ b/update-tunnelbroker.rsc
@@ -15,7 +15,7 @@
 :while ($GlobalFunctionsReady != true) do={ :delay 500ms; }
 
 :local ExitOK false;
-:do {
+:onerror Err {
   :local ScriptName [ :jobname ];
 
   :global CertificateAvailable;
@@ -69,6 +69,6 @@
       /interface/6to4/set $Interface local-address=$PublicAddress;
     }
   }
-} on-error={
-  :global ExitError; $ExitError $ExitOK [ :jobname ];
+} do={
+  :global ExitError; $ExitError $ExitOK [ :jobname ] $Err;
 }

From e330e1e6d9b09ffbf6f870525fc6d37b4733f36a Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Tue, 6 May 2025 09:45:14 +0200
Subject: [PATCH 041/129] mod/bridge-port-to: use :onerror for outer block

---
 mod/bridge-port-to.rsc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/mod/bridge-port-to.rsc b/mod/bridge-port-to.rsc
index 39a036e5..93eedcef 100644
--- a/mod/bridge-port-to.rsc
+++ b/mod/bridge-port-to.rsc
@@ -10,7 +10,7 @@
 
 :global BridgePortTo;
 
-:set BridgePortTo do={ :do {
+:set BridgePortTo do={ :onerror Err {
   :local BridgePortTo [ :tostr $1 ];
 
   :global IfThenElse;
@@ -65,6 +65,6 @@
     $LogPrint info $0 ("Re-enabling interfaces...");
     /interface/ethernet/enable $InterfaceReEnable;
   }
-} on-error={
-  :global ExitError; $ExitError false $0;
+} do={
+  :global ExitError; $ExitError false $0 $Err;
 } }

From cb46e4fba6032f3676cde2e274123554333bdf27 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Tue, 6 May 2025 09:45:14 +0200
Subject: [PATCH 042/129] mod/bridge-port-vlan: use :onerror for outer block

---
 mod/bridge-port-vlan.rsc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/mod/bridge-port-vlan.rsc b/mod/bridge-port-vlan.rsc
index 0eeb9b5f..6deee994 100644
--- a/mod/bridge-port-vlan.rsc
+++ b/mod/bridge-port-vlan.rsc
@@ -10,7 +10,7 @@
 
 :global BridgePortVlan;
 
-:global BridgePortVlan do={ :do {
+:global BridgePortVlan do={ :onerror Err {
   :local ConfigTo [ :tostr $1 ];
 
   :global IfThenElse;
@@ -74,6 +74,6 @@
     $LogPrint info $0 ("Re-enabling interfaces...");
     /interface/ethernet/enable $InterfaceReEnable;
   }
-} on-error={
-  :global ExitError; $ExitError false $0;
+} do={
+  :global ExitError; $ExitError false $0 $Err;
 } }

From 3b34f55712e9f97394aefca99b9081f79981cbc3 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Tue, 6 May 2025 09:45:14 +0200
Subject: [PATCH 043/129] mod/inspectvar: use :onerror for outer block

---
 mod/inspectvar.rsc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/mod/inspectvar.rsc b/mod/inspectvar.rsc
index c8615573..89c02860 100644
--- a/mod/inspectvar.rsc
+++ b/mod/inspectvar.rsc
@@ -12,12 +12,12 @@
 :global InspectVarReturn;
 
 # inspect variable and print on terminal
-:set InspectVar do={ :do {
+:set InspectVar do={ :onerror Err {
   :global InspectVarReturn;
 
   :put [ :tocrlf [ $InspectVarReturn $1 ] ];
-} on-error={
-  :global ExitError; $ExitError false $0;
+} do={
+  :global ExitError; $ExitError false $0 $Err;
 } }
 
 # inspect variable and return formatted string

From 8705c4a394a75121f350849b120fb08cc22f3944 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Tue, 6 May 2025 09:45:14 +0200
Subject: [PATCH 044/129] mod/ipcalc: use :onerror for outer block

---
 mod/ipcalc.rsc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/mod/ipcalc.rsc b/mod/ipcalc.rsc
index 477cf4a8..eacff6d9 100644
--- a/mod/ipcalc.rsc
+++ b/mod/ipcalc.rsc
@@ -12,7 +12,7 @@
 :global IPCalcReturn;
 
 # print netmask, network, min host, max host and broadcast
-:set IPCalc do={ :do {
+:set IPCalc do={ :onerror Err {
   :local Input [ :tostr $1 ];
 
   :global FormatLine;
@@ -27,8 +27,8 @@
     [ $FormatLine "HostMin" ($Values->"hostmin") ] . "\n" . \
     [ $FormatLine "HostMax" ($Values->"hostmax") ] . "\n" . \
     [ $FormatLine "Broadcast" ($Values->"broadcast") ]) ];
-} on-error={
-  :global ExitError; $ExitError false $0;
+} do={
+  :global ExitError; $ExitError false $0 $Err;
 } }
 
 # calculate and return netmask, network, min host, max host and broadcast

From 12e5f1cacc5dbd548c53870c1d407c9b865ad0e8 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Tue, 6 May 2025 09:45:14 +0200
Subject: [PATCH 045/129] mod/notification-email: use :onerror for outer block

---
 mod/notification-email.rsc | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/mod/notification-email.rsc b/mod/notification-email.rsc
index 7b89d985..c0f9d860 100644
--- a/mod/notification-email.rsc
+++ b/mod/notification-email.rsc
@@ -35,7 +35,7 @@
 }
 
 # flush e-mail queue
-:set FlushEmailQueue do={ :do {
+:set FlushEmailQueue do={ :onerror Err {
   :global EmailQueue;
 
   :global EitherOr;
@@ -135,8 +135,8 @@
 
   /system/scheduler/set interval=(($SchedVal->"run-count") . "m") \
       comment="Waiting for retry..." $Scheduler;
-} on-error={
-  :global ExitError; $ExitError false $0;
+} do={
+  :global ExitError; $ExitError false $0 $Err;
 } }
 
 # generate filter for log-forward
@@ -248,12 +248,12 @@
 }
 
 # send notification via e-mail - expects at least two string arguments
-:set SendEMail do={ :do {
+:set SendEMail do={ :onerror Err {
   :global SendEMail2;
 
   $SendEMail2 ({ origin=$0; subject=$1; message=$2; link=$3 });
-} on-error={
-  :global ExitError; $ExitError false $0;
+} do={
+  :global ExitError; $ExitError false $0 $Err;
 } }
 
 # send notification via e-mail - expects one array argument

From 8f8eef8dcc6b13cbae93aad4144004065c442697 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Tue, 6 May 2025 09:45:14 +0200
Subject: [PATCH 046/129] mod/notification-gotify: use :onerror for outer block

---
 mod/notification-gotify.rsc | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/mod/notification-gotify.rsc b/mod/notification-gotify.rsc
index 70709189..3ae4cdd3 100644
--- a/mod/notification-gotify.rsc
+++ b/mod/notification-gotify.rsc
@@ -17,7 +17,7 @@
 :global SendGotify2;
 
 # flush Gotify queue
-:set FlushGotifyQueue do={ :do {
+:set FlushGotifyQueue do={ :onerror Err {
   :global GotifyQueue;
 
   :global IsFullyConnected;
@@ -53,8 +53,8 @@
     /system/scheduler/remove [ find where name="_FlushGotifyQueue" ];
     :set GotifyQueue;
   }
-} on-error={
-  :global ExitError; $ExitError false $0;
+} do={
+  :global ExitError; $ExitError false $0 $Err;
 } }
 
 # send notification via Gotify - expects one array argument
@@ -121,12 +121,12 @@
 }
 
 # send notification via Gotify - expects at least two string arguments
-:set SendGotify do={ :do {
+:set SendGotify do={ :onerror Err {
   :global SendGotify2;
 
   $SendGotify2 ({ origin=$0; subject=$1; message=$2; link=$3; silent=$4 });
-} on-error={
-  :global ExitError; $ExitError false $0;
+} do={
+  :global ExitError; $ExitError false $0 $Err;
 } }
 
 # send notification via Gotify - expects one array argument

From 73767f0f53173489b68503c81510d7d348e5ffde Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Tue, 6 May 2025 09:45:14 +0200
Subject: [PATCH 047/129] mod/notification-matrix: use :onerror for outer block

---
 mod/notification-matrix.rsc | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/mod/notification-matrix.rsc b/mod/notification-matrix.rsc
index e989ee04..c8cf887c 100644
--- a/mod/notification-matrix.rsc
+++ b/mod/notification-matrix.rsc
@@ -19,7 +19,7 @@
 :global SetupMatrixJoinRoom;
 
 # flush Matrix queue
-:set FlushMatrixQueue do={ :do {
+:set FlushMatrixQueue do={ :onerror Err {
   :global MatrixQueue;
 
   :global IsFullyConnected;
@@ -58,8 +58,8 @@
     /system/scheduler/remove [ find where name="_FlushMatrixQueue" ];
     :set MatrixQueue;
   }
-} on-error={
-  :global ExitError; $ExitError false $0;
+} do={
+  :global ExitError; $ExitError false $0 $Err;
 } }
 
 # send notification via Matrix - expects one array argument
@@ -167,12 +167,12 @@
 }
 
 # send notification via Matrix - expects at least two string arguments
-:set SendMatrix do={ :do {
+:set SendMatrix do={ :onerror Err {
   :global SendMatrix2;
 
   $SendMatrix2 ({ origin=$0; subject=$1; message=$2; link=$3 });
-} on-error={
-  :global ExitError; $ExitError false $0;
+} do={
+  :global ExitError; $ExitError false $0 $Err;
 } }
 
 # send notification via Matrix - expects one array argument

From e56b8a107f699011c54c6e0f30cf68f1f847854d Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Tue, 6 May 2025 09:45:14 +0200
Subject: [PATCH 048/129] mod/notification-ntfy: use :onerror for outer block

---
 mod/notification-ntfy.rsc | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/mod/notification-ntfy.rsc b/mod/notification-ntfy.rsc
index 2748c5b6..8e5688e8 100644
--- a/mod/notification-ntfy.rsc
+++ b/mod/notification-ntfy.rsc
@@ -16,7 +16,7 @@
 :global SendNtfy2;
 
 # flush ntfy queue
-:set FlushNtfyQueue do={ :do {
+:set FlushNtfyQueue do={ :onerror Err {
   :global NtfyQueue;
 
   :global IsFullyConnected;
@@ -52,8 +52,8 @@
     /system/scheduler/remove [ find where name="_FlushNtfyQueue" ];
     :set NtfyQueue;
   }
-} on-error={
-  :global ExitError; $ExitError false $0;
+} do={
+  :global ExitError; $ExitError false $0 $Err;
 } }
 
 # send notification via ntfy - expects one array argument
@@ -143,12 +143,12 @@
 }
 
 # send notification via ntfy - expects at least two string arguments
-:set SendNtfy do={ :do {
+:set SendNtfy do={ :onerror Err {
   :global SendNtfy2;
 
   $SendNtfy2 ({ origin=$0; subject=$1; message=$2; link=$3; silent=$4 });
-} on-error={
-  :global ExitError; $ExitError false $0;
+} do={
+  :global ExitError; $ExitError false $0 $Err;
 } }
 
 # send notification via ntfy - expects one array argument

From d9e91b918134f23b3b906ff9ae23ddc8ee25c178 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Tue, 6 May 2025 09:45:14 +0200
Subject: [PATCH 049/129] mod/notification-telegram: use :onerror for outer
 block

---
 mod/notification-telegram.rsc | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/mod/notification-telegram.rsc b/mod/notification-telegram.rsc
index 5ef353b4..51c8dbf7 100644
--- a/mod/notification-telegram.rsc
+++ b/mod/notification-telegram.rsc
@@ -17,7 +17,7 @@
 :global SendTelegram2;
 
 # flush telegram queue
-:set FlushTelegramQueue do={ :do {
+:set FlushTelegramQueue do={ :onerror Err {
   :global TelegramQueue;
   :global TelegramMessageIDs;
 
@@ -55,12 +55,12 @@
     /system/scheduler/remove [ find where name="_FlushTelegramQueue" ];
     :set TelegramQueue;
   }
-} on-error={
-  :global ExitError; $ExitError false $0;
+} do={
+  :global ExitError; $ExitError false $0 $Err;
 } }
 
 # get the chat id
-:set GetTelegramChatId do={ :do {
+:set GetTelegramChatId do={ :onerror Err {
   :global TelegramTokenId;
 
   :global CertificateAvailable;
@@ -94,8 +94,8 @@
   :if (($Message->"is_topic_message") = true) do={
     $LogPrint info $0 ("The thread id is: " . ($Message->"message_thread_id"));
   }
-} on-error={ 
-  :global ExitError; $ExitError false $0;
+} do={
+  :global ExitError; $ExitError false $0 $Err;
 } } 
 
 # send notification via telegram - expects one array argument
@@ -226,12 +226,12 @@
 }
 
 # send notification via telegram - expects at least two string arguments
-:set SendTelegram do={ :do {
+:set SendTelegram do={ :onerror Err {
   :global SendTelegram2;
 
   $SendTelegram2 ({ origin=$0; subject=$1; message=$2; link=$3; silent=$4 });
-} on-error={
-  :global ExitError; $ExitError false $0;
+} do={
+  :global ExitError; $ExitError false $0 $Err;
 } }
 
 # send notification via telegram - expects one array argument

From 2e284e05dcff60c8730d210d8026f9b18a265ffd Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Tue, 6 May 2025 09:45:14 +0200
Subject: [PATCH 050/129] mod/scriptrunonce: use :onerror for outer block

---
 mod/scriptrunonce.rsc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/mod/scriptrunonce.rsc b/mod/scriptrunonce.rsc
index 7fcd5b5b..3797c155 100644
--- a/mod/scriptrunonce.rsc
+++ b/mod/scriptrunonce.rsc
@@ -11,7 +11,7 @@
 :global ScriptRunOnce;
 
 # fetch and run script(s) once
-:set ScriptRunOnce do={ :do {
+:set ScriptRunOnce do={ :onerror Err {
   :local Scripts [ :toarray $1 ];
 
   :global ScriptRunOnceBaseUrl;
@@ -51,6 +51,6 @@
 
     :return true;
   }
-} on-error={
-  :global ExitError; $ExitError false $0;
+} do={
+  :global ExitError; $ExitError false $0 $Err;
 } }

From 792a2f86f1820b0a168a00e02772afdfe5db6225 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Tue, 6 May 2025 09:45:14 +0200
Subject: [PATCH 051/129] mod/ssh-keys-import: use :onerror for outer block

---
 mod/ssh-keys-import.rsc | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/mod/ssh-keys-import.rsc b/mod/ssh-keys-import.rsc
index 2fae4b13..9a6cd398 100644
--- a/mod/ssh-keys-import.rsc
+++ b/mod/ssh-keys-import.rsc
@@ -12,7 +12,7 @@
 :global SSHKeysImportFile;
 
 # import single key passed as string
-:set SSHKeysImport do={ :do {
+:set SSHKeysImport do={ :onerror Err {
   :local Key  [ :tostr $1 ];
   :local User [ :tostr $2 ];
 
@@ -65,12 +65,12 @@
     $RmDir "tmpfs/ssh-keys-import";
     :return false;
   }
-} on-error={
-  :global ExitError; $ExitError false $0;
+} do={
+  :global ExitError; $ExitError false $0 $Err;
 } }
 
 # import keys from a file
-:set SSHKeysImportFile do={ :do {
+:set SSHKeysImportFile do={ :onerror Err {
   :local FileName [ :tostr $1 ];
   :local User     [ :tostr $2 ];
 
@@ -109,6 +109,6 @@
       $LogPrint warning $0 ("SSH key of type '" . $KeyVal->0 . "' is not supported.");
     }
   }
-} on-error={
-  :global ExitError; $ExitError false $0;
+} do={
+  :global ExitError; $ExitError false $0 $Err;
 } }

From 921f916bdc2db4e91185fc67d8f42ae114771114 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Tue, 6 May 2025 11:15:15 +0200
Subject: [PATCH 052/129] accesslist-duplicates: fail if global functions do
 not become ready

---
 accesslist-duplicates.capsman.rsc  | 6 +++---
 accesslist-duplicates.local.rsc    | 6 +++---
 accesslist-duplicates.template.rsc | 6 +++---
 accesslist-duplicates.wifi.rsc     | 6 +++---
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/accesslist-duplicates.capsman.rsc b/accesslist-duplicates.capsman.rsc
index c0967541..545b24ea 100644
--- a/accesslist-duplicates.capsman.rsc
+++ b/accesslist-duplicates.capsman.rsc
@@ -10,11 +10,11 @@
 #
 # !! Do not edit this file, it is generated from template!
 
-:global GlobalFunctionsReady;
-:while ($GlobalFunctionsReady != true) do={ :delay 500ms; }
-
 :local ExitOK false;
 :onerror Err {
+  :global GlobalFunctionsReady;
+  :retry { :if ($GlobalFunctionsReady != true) \
+      do={ :error ("Global functions not ready."); }; } delay=500ms max=50;
   :local ScriptName [ :jobname ];
 
   :local Seen ({});
diff --git a/accesslist-duplicates.local.rsc b/accesslist-duplicates.local.rsc
index 6f2d1205..ac2c7fe3 100644
--- a/accesslist-duplicates.local.rsc
+++ b/accesslist-duplicates.local.rsc
@@ -10,11 +10,11 @@
 #
 # !! Do not edit this file, it is generated from template!
 
-:global GlobalFunctionsReady;
-:while ($GlobalFunctionsReady != true) do={ :delay 500ms; }
-
 :local ExitOK false;
 :onerror Err {
+  :global GlobalFunctionsReady;
+  :retry { :if ($GlobalFunctionsReady != true) \
+      do={ :error ("Global functions not ready."); }; } delay=500ms max=50;
   :local ScriptName [ :jobname ];
 
   :local Seen ({});
diff --git a/accesslist-duplicates.template.rsc b/accesslist-duplicates.template.rsc
index b08f2adb..89559918 100644
--- a/accesslist-duplicates.template.rsc
+++ b/accesslist-duplicates.template.rsc
@@ -11,11 +11,11 @@
 # !! This is just a template to generate the real script!
 # !! Pattern '%TEMPL%' is replaced, paths are filtered.
 
-:global GlobalFunctionsReady;
-:while ($GlobalFunctionsReady != true) do={ :delay 500ms; }
-
 :local ExitOK false;
 :onerror Err {
+  :global GlobalFunctionsReady;
+  :retry { :if ($GlobalFunctionsReady != true) \
+      do={ :error ("Global functions not ready."); }; } delay=500ms max=50;
   :local ScriptName [ :jobname ];
 
   :local Seen ({});
diff --git a/accesslist-duplicates.wifi.rsc b/accesslist-duplicates.wifi.rsc
index ccd04f5d..331de751 100644
--- a/accesslist-duplicates.wifi.rsc
+++ b/accesslist-duplicates.wifi.rsc
@@ -10,11 +10,11 @@
 #
 # !! Do not edit this file, it is generated from template!
 
-:global GlobalFunctionsReady;
-:while ($GlobalFunctionsReady != true) do={ :delay 500ms; }
-
 :local ExitOK false;
 :onerror Err {
+  :global GlobalFunctionsReady;
+  :retry { :if ($GlobalFunctionsReady != true) \
+      do={ :error ("Global functions not ready."); }; } delay=500ms max=50;
   :local ScriptName [ :jobname ];
 
   :local Seen ({});

From 62e7bc74cbf62ccb1ffb352b58e5767f939fbbdd Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Tue, 6 May 2025 11:15:15 +0200
Subject: [PATCH 053/129] backup-cloud: fail if global functions do not become
 ready

---
 backup-cloud.rsc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/backup-cloud.rsc b/backup-cloud.rsc
index bc09aac2..f0861f09 100644
--- a/backup-cloud.rsc
+++ b/backup-cloud.rsc
@@ -9,11 +9,11 @@
 # upload backup to MikroTik cloud
 # https://rsc.eworm.de/doc/backup-cloud.md
 
-:global GlobalFunctionsReady;
-:while ($GlobalFunctionsReady != true) do={ :delay 500ms; }
-
 :local ExitOK false;
 :onerror Err {
+  :global GlobalFunctionsReady;
+  :retry { :if ($GlobalFunctionsReady != true) \
+      do={ :error ("Global functions not ready."); }; } delay=500ms max=50;
   :local ScriptName [ :jobname ];
 
   :global BackupRandomDelay;

From ed254b56d80380620ed1df50b413ff10689c5675 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Tue, 6 May 2025 11:15:15 +0200
Subject: [PATCH 054/129] backup-email: fail if global functions do not become
 ready

---
 backup-email.rsc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/backup-email.rsc b/backup-email.rsc
index 95f25109..da2ee02d 100644
--- a/backup-email.rsc
+++ b/backup-email.rsc
@@ -9,11 +9,11 @@
 # create and email backup and config file
 # https://rsc.eworm.de/doc/backup-email.md
 
-:global GlobalFunctionsReady;
-:while ($GlobalFunctionsReady != true) do={ :delay 500ms; }
-
 :local ExitOK false;
 :onerror Err {
+  :global GlobalFunctionsReady;
+  :retry { :if ($GlobalFunctionsReady != true) \
+      do={ :error ("Global functions not ready."); }; } delay=500ms max=50;
   :local ScriptName [ :jobname ];
 
   :global BackupPassword;

From 2ee7e3d57670c517e907f33a38ff1cf3cf2eeab2 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Tue, 6 May 2025 11:15:15 +0200
Subject: [PATCH 055/129] backup-partition: fail if global functions do not
 become ready

---
 backup-partition.rsc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/backup-partition.rsc b/backup-partition.rsc
index 42f77904..f99a66c1 100644
--- a/backup-partition.rsc
+++ b/backup-partition.rsc
@@ -10,11 +10,11 @@
 # save configuration to fallback partition
 # https://rsc.eworm.de/doc/backup-partition.md
 
-:global GlobalFunctionsReady;
-:while ($GlobalFunctionsReady != true) do={ :delay 500ms; }
-
 :local ExitOK false;
 :onerror Err {
+  :global GlobalFunctionsReady;
+  :retry { :if ($GlobalFunctionsReady != true) \
+      do={ :error ("Global functions not ready."); }; } delay=500ms max=50;
   :local ScriptName [ :jobname ];
 
   :global BackupPartitionCopyBeforeFeatureUpdate;

From de84ff8f4bf86ca8ca39d3bd38bff92ee6731d71 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Tue, 6 May 2025 11:15:15 +0200
Subject: [PATCH 056/129] backup-upload: fail if global functions do not become
 ready

---
 backup-upload.rsc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/backup-upload.rsc b/backup-upload.rsc
index 945659a0..9373b4c1 100644
--- a/backup-upload.rsc
+++ b/backup-upload.rsc
@@ -10,11 +10,11 @@
 # create and upload backup and config file
 # https://rsc.eworm.de/doc/backup-upload.md
 
-:global GlobalFunctionsReady;
-:while ($GlobalFunctionsReady != true) do={ :delay 500ms; }
-
 :local ExitOK false;
 :onerror Err {
+  :global GlobalFunctionsReady;
+  :retry { :if ($GlobalFunctionsReady != true) \
+      do={ :error ("Global functions not ready."); }; } delay=500ms max=50;
   :local ScriptName [ :jobname ];
 
   :global BackupPassword;

From fbcff8ed1ad0566b4adf326b4a2a8aa115ee5bdd Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Tue, 6 May 2025 11:15:15 +0200
Subject: [PATCH 057/129] capsman-download-packages: fail if global functions
 do not become ready

---
 capsman-download-packages.capsman.rsc  | 6 +++---
 capsman-download-packages.template.rsc | 6 +++---
 capsman-download-packages.wifi.rsc     | 6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/capsman-download-packages.capsman.rsc b/capsman-download-packages.capsman.rsc
index 688f7041..ee826386 100644
--- a/capsman-download-packages.capsman.rsc
+++ b/capsman-download-packages.capsman.rsc
@@ -11,11 +11,11 @@
 #
 # !! Do not edit this file, it is generated from template!
 
-:global GlobalFunctionsReady;
-:while ($GlobalFunctionsReady != true) do={ :delay 500ms; }
-
 :local ExitOK false;
 :onerror Err {
+  :global GlobalFunctionsReady;
+  :retry { :if ($GlobalFunctionsReady != true) \
+      do={ :error ("Global functions not ready."); }; } delay=500ms max=50;
   :local ScriptName [ :jobname ];
 
   :global CleanFilePath;
diff --git a/capsman-download-packages.template.rsc b/capsman-download-packages.template.rsc
index 12506ead..91a9167c 100644
--- a/capsman-download-packages.template.rsc
+++ b/capsman-download-packages.template.rsc
@@ -12,11 +12,11 @@
 # !! This is just a template to generate the real script!
 # !! Pattern '%TEMPL%' is replaced, paths are filtered.
 
-:global GlobalFunctionsReady;
-:while ($GlobalFunctionsReady != true) do={ :delay 500ms; }
-
 :local ExitOK false;
 :onerror Err {
+  :global GlobalFunctionsReady;
+  :retry { :if ($GlobalFunctionsReady != true) \
+      do={ :error ("Global functions not ready."); }; } delay=500ms max=50;
   :local ScriptName [ :jobname ];
 
   :global CleanFilePath;
diff --git a/capsman-download-packages.wifi.rsc b/capsman-download-packages.wifi.rsc
index 78238ef3..cb6cb6f4 100644
--- a/capsman-download-packages.wifi.rsc
+++ b/capsman-download-packages.wifi.rsc
@@ -11,11 +11,11 @@
 #
 # !! Do not edit this file, it is generated from template!
 
-:global GlobalFunctionsReady;
-:while ($GlobalFunctionsReady != true) do={ :delay 500ms; }
-
 :local ExitOK false;
 :onerror Err {
+  :global GlobalFunctionsReady;
+  :retry { :if ($GlobalFunctionsReady != true) \
+      do={ :error ("Global functions not ready."); }; } delay=500ms max=50;
   :local ScriptName [ :jobname ];
 
   :global CleanFilePath;

From 506349a582bc13b415d4c3d260dca3687f030e83 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Tue, 6 May 2025 11:15:15 +0200
Subject: [PATCH 058/129] capsman-rolling-upgrade: fail if global functions do
 not become ready

---
 capsman-rolling-upgrade.capsman.rsc  | 6 +++---
 capsman-rolling-upgrade.template.rsc | 6 +++---
 capsman-rolling-upgrade.wifi.rsc     | 6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/capsman-rolling-upgrade.capsman.rsc b/capsman-rolling-upgrade.capsman.rsc
index 813b8e59..20978802 100644
--- a/capsman-rolling-upgrade.capsman.rsc
+++ b/capsman-rolling-upgrade.capsman.rsc
@@ -12,11 +12,11 @@
 #
 # !! Do not edit this file, it is generated from template!
 
-:global GlobalFunctionsReady;
-:while ($GlobalFunctionsReady != true) do={ :delay 500ms; }
-
 :local ExitOK false;
 :onerror Err {
+  :global GlobalFunctionsReady;
+  :retry { :if ($GlobalFunctionsReady != true) \
+      do={ :error ("Global functions not ready."); }; } delay=500ms max=50;
   :local ScriptName [ :jobname ];
 
   :global LogPrint;
diff --git a/capsman-rolling-upgrade.template.rsc b/capsman-rolling-upgrade.template.rsc
index 355926da..75de088f 100644
--- a/capsman-rolling-upgrade.template.rsc
+++ b/capsman-rolling-upgrade.template.rsc
@@ -13,11 +13,11 @@
 # !! This is just a template to generate the real script!
 # !! Pattern '%TEMPL%' is replaced, paths are filtered.
 
-:global GlobalFunctionsReady;
-:while ($GlobalFunctionsReady != true) do={ :delay 500ms; }
-
 :local ExitOK false;
 :onerror Err {
+  :global GlobalFunctionsReady;
+  :retry { :if ($GlobalFunctionsReady != true) \
+      do={ :error ("Global functions not ready."); }; } delay=500ms max=50;
   :local ScriptName [ :jobname ];
 
   :global LogPrint;
diff --git a/capsman-rolling-upgrade.wifi.rsc b/capsman-rolling-upgrade.wifi.rsc
index 3d5c801f..e6c6facb 100644
--- a/capsman-rolling-upgrade.wifi.rsc
+++ b/capsman-rolling-upgrade.wifi.rsc
@@ -12,11 +12,11 @@
 #
 # !! Do not edit this file, it is generated from template!
 
-:global GlobalFunctionsReady;
-:while ($GlobalFunctionsReady != true) do={ :delay 500ms; }
-
 :local ExitOK false;
 :onerror Err {
+  :global GlobalFunctionsReady;
+  :retry { :if ($GlobalFunctionsReady != true) \
+      do={ :error ("Global functions not ready."); }; } delay=500ms max=50;
   :local ScriptName [ :jobname ];
 
   :global LogPrint;

From 219cc3c8aaffe17a28a1858bf70ef634c36c19fd Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Tue, 6 May 2025 11:15:15 +0200
Subject: [PATCH 059/129] certificate-renew-issued: fail if global functions do
 not become ready

---
 certificate-renew-issued.rsc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/certificate-renew-issued.rsc b/certificate-renew-issued.rsc
index dc724b00..3fd60208 100644
--- a/certificate-renew-issued.rsc
+++ b/certificate-renew-issued.rsc
@@ -8,11 +8,11 @@
 # renew locally issued certificates
 # https://rsc.eworm.de/doc/certificate-renew-issued.md
 
-:global GlobalFunctionsReady;
-:while ($GlobalFunctionsReady != true) do={ :delay 500ms; }
-
 :local ExitOK false;
 :onerror Err {
+  :global GlobalFunctionsReady;
+  :retry { :if ($GlobalFunctionsReady != true) \
+      do={ :error ("Global functions not ready."); }; } delay=500ms max=50;
   :local ScriptName [ :jobname ];
 
   :global CertIssuedExportPass;

From a199f1b90b1257679d52ff833a5b7c36fae6c727 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Tue, 6 May 2025 11:15:15 +0200
Subject: [PATCH 060/129] check-certificates: fail if global functions do not
 become ready

---
 check-certificates.rsc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/check-certificates.rsc b/check-certificates.rsc
index 75a006eb..505ec4b0 100644
--- a/check-certificates.rsc
+++ b/check-certificates.rsc
@@ -9,11 +9,11 @@
 # check for certificate validity
 # https://rsc.eworm.de/doc/check-certificates.md
 
-:global GlobalFunctionsReady;
-:while ($GlobalFunctionsReady != true) do={ :delay 500ms; }
-
 :local ExitOK false;
 :onerror Err {
+  :global GlobalFunctionsReady;
+  :retry { :if ($GlobalFunctionsReady != true) \
+      do={ :error ("Global functions not ready."); }; } delay=500ms max=50;
   :local ScriptName [ :jobname ];
 
   :global CertRenewTime;

From 5ae62f259c205d625af7de275b46e4f7c59d2e51 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Tue, 6 May 2025 11:15:15 +0200
Subject: [PATCH 061/129] check-health: fail if global functions do not become
 ready

---
 check-health.rsc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/check-health.rsc b/check-health.rsc
index 75710a07..40ce101d 100644
--- a/check-health.rsc
+++ b/check-health.rsc
@@ -8,11 +8,11 @@
 # check for RouterOS health state
 # https://rsc.eworm.de/doc/check-health.md
 
-:global GlobalFunctionsReady;
-:while ($GlobalFunctionsReady != true) do={ :delay 500ms; }
-
 :local ExitOK false;
 :onerror Err {
+  :global GlobalFunctionsReady;
+  :retry { :if ($GlobalFunctionsReady != true) \
+      do={ :error ("Global functions not ready."); }; } delay=500ms max=50;
   :local ScriptName [ :jobname ];
 
   :global CheckHealthCPUUtilization;

From b16740850d795855c61304452580cd15fbf66012 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Tue, 6 May 2025 11:15:15 +0200
Subject: [PATCH 062/129] check-lte-firmware-upgrade: fail if global functions
 do not become ready

---
 check-lte-firmware-upgrade.rsc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/check-lte-firmware-upgrade.rsc b/check-lte-firmware-upgrade.rsc
index f0b173fa..6030e4d4 100644
--- a/check-lte-firmware-upgrade.rsc
+++ b/check-lte-firmware-upgrade.rsc
@@ -8,11 +8,11 @@
 # check for LTE firmware upgrade, send notification
 # https://rsc.eworm.de/doc/check-lte-firmware-upgrade.md
 
-:global GlobalFunctionsReady;
-:while ($GlobalFunctionsReady != true) do={ :delay 500ms; }
-
 :local ExitOK false;
 :onerror Err {
+  :global GlobalFunctionsReady;
+  :retry { :if ($GlobalFunctionsReady != true) \
+      do={ :error ("Global functions not ready."); }; } delay=500ms max=50;
   :local ScriptName [ :jobname ];
 
   :global SentLteFirmwareUpgradeNotification;

From 295a798157abe3732b32a896f1578db5512e17e5 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Tue, 6 May 2025 11:15:15 +0200
Subject: [PATCH 063/129] check-perpetual-license: fail if global functions do
 not become ready

---
 check-perpetual-license.rsc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/check-perpetual-license.rsc b/check-perpetual-license.rsc
index 7caa69aa..d46f0b49 100644
--- a/check-perpetual-license.rsc
+++ b/check-perpetual-license.rsc
@@ -8,11 +8,11 @@
 # check perpetual license on CHR
 # https://rsc.eworm.de/doc/check-perpetual-license.md
 
-:global GlobalFunctionsReady;
-:while ($GlobalFunctionsReady != true) do={ :delay 500ms; }
-
 :local ExitOK false;
 :onerror Err {
+  :global GlobalFunctionsReady;
+  :retry { :if ($GlobalFunctionsReady != true) \
+      do={ :error ("Global functions not ready."); }; } delay=500ms max=50;
   :local ScriptName [ :jobname ];
 
   :global Identity;

From 4a7cdfb23eae4ccbd6ca3682b12d9936a9df654d Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Tue, 6 May 2025 10:46:44 +0200
Subject: [PATCH 064/129] check-routeros-update: fail if global functions do
 not become ready

---
 check-routeros-update.rsc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/check-routeros-update.rsc b/check-routeros-update.rsc
index ee7e5dac..932256ad 100644
--- a/check-routeros-update.rsc
+++ b/check-routeros-update.rsc
@@ -9,11 +9,11 @@
 # check for RouterOS update, send notification and/or install
 # https://rsc.eworm.de/doc/check-routeros-update.md
 
-:global GlobalFunctionsReady;
-:while ($GlobalFunctionsReady != true) do={ :delay 500ms; }
-
 :local ExitOK false;
 :onerror Err {
+  :global GlobalFunctionsReady;
+  :retry { :if ($GlobalFunctionsReady != true) \
+      do={ :error ("Global functions not ready."); }; } delay=500ms max=50;
   :local ScriptName [ :jobname ];
 
   :global Identity;

From 1422c9bd7fde013da997f1273fa5ee5d018af29d Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Tue, 6 May 2025 11:15:15 +0200
Subject: [PATCH 065/129] collect-wireless-mac: fail if global functions do not
 become ready

---
 collect-wireless-mac.capsman.rsc  | 6 +++---
 collect-wireless-mac.local.rsc    | 6 +++---
 collect-wireless-mac.template.rsc | 6 +++---
 collect-wireless-mac.wifi.rsc     | 6 +++---
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/collect-wireless-mac.capsman.rsc b/collect-wireless-mac.capsman.rsc
index 5cec9b90..fa6198a0 100644
--- a/collect-wireless-mac.capsman.rsc
+++ b/collect-wireless-mac.capsman.rsc
@@ -11,11 +11,11 @@
 #
 # !! Do not edit this file, it is generated from template!
 
-:global GlobalFunctionsReady;
-:while ($GlobalFunctionsReady != true) do={ :delay 500ms; }
-
 :local ExitOK false;
 :onerror Err {
+  :global GlobalFunctionsReady;
+  :retry { :if ($GlobalFunctionsReady != true) \
+      do={ :error ("Global functions not ready."); }; } delay=500ms max=50;
   :local ScriptName [ :jobname ];
 
   :global Identity;
diff --git a/collect-wireless-mac.local.rsc b/collect-wireless-mac.local.rsc
index db75d69b..4082bbbe 100644
--- a/collect-wireless-mac.local.rsc
+++ b/collect-wireless-mac.local.rsc
@@ -11,11 +11,11 @@
 #
 # !! Do not edit this file, it is generated from template!
 
-:global GlobalFunctionsReady;
-:while ($GlobalFunctionsReady != true) do={ :delay 500ms; }
-
 :local ExitOK false;
 :onerror Err {
+  :global GlobalFunctionsReady;
+  :retry { :if ($GlobalFunctionsReady != true) \
+      do={ :error ("Global functions not ready."); }; } delay=500ms max=50;
   :local ScriptName [ :jobname ];
 
   :global Identity;
diff --git a/collect-wireless-mac.template.rsc b/collect-wireless-mac.template.rsc
index 144a8be1..51671562 100644
--- a/collect-wireless-mac.template.rsc
+++ b/collect-wireless-mac.template.rsc
@@ -12,11 +12,11 @@
 # !! This is just a template to generate the real script!
 # !! Pattern '%TEMPL%' is replaced, paths are filtered.
 
-:global GlobalFunctionsReady;
-:while ($GlobalFunctionsReady != true) do={ :delay 500ms; }
-
 :local ExitOK false;
 :onerror Err {
+  :global GlobalFunctionsReady;
+  :retry { :if ($GlobalFunctionsReady != true) \
+      do={ :error ("Global functions not ready."); }; } delay=500ms max=50;
   :local ScriptName [ :jobname ];
 
   :global Identity;
diff --git a/collect-wireless-mac.wifi.rsc b/collect-wireless-mac.wifi.rsc
index 74f3ec6d..af0dd8b2 100644
--- a/collect-wireless-mac.wifi.rsc
+++ b/collect-wireless-mac.wifi.rsc
@@ -11,11 +11,11 @@
 #
 # !! Do not edit this file, it is generated from template!
 
-:global GlobalFunctionsReady;
-:while ($GlobalFunctionsReady != true) do={ :delay 500ms; }
-
 :local ExitOK false;
 :onerror Err {
+  :global GlobalFunctionsReady;
+  :retry { :if ($GlobalFunctionsReady != true) \
+      do={ :error ("Global functions not ready."); }; } delay=500ms max=50;
   :local ScriptName [ :jobname ];
 
   :global Identity;

From 75c9fcbe8b10c25f268ee4e0e3c8c813dd753c54 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Tue, 6 May 2025 11:15:15 +0200
Subject: [PATCH 066/129] daily-psk: fail if global functions do not become
 ready

---
 daily-psk.capsman.rsc  | 6 +++---
 daily-psk.local.rsc    | 6 +++---
 daily-psk.template.rsc | 6 +++---
 daily-psk.wifi.rsc     | 6 +++---
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/daily-psk.capsman.rsc b/daily-psk.capsman.rsc
index e4e7b8b1..a1b01fc8 100644
--- a/daily-psk.capsman.rsc
+++ b/daily-psk.capsman.rsc
@@ -11,11 +11,11 @@
 #
 # !! Do not edit this file, it is generated from template!
 
-:global GlobalFunctionsReady;
-:while ($GlobalFunctionsReady != true) do={ :delay 500ms; }
-
 :local ExitOK false;
 :onerror Err {
+  :global GlobalFunctionsReady;
+  :retry { :if ($GlobalFunctionsReady != true) \
+      do={ :error ("Global functions not ready."); }; } delay=500ms max=50;
   :local ScriptName [ :jobname ];
 
   :global DailyPskMatchComment;
diff --git a/daily-psk.local.rsc b/daily-psk.local.rsc
index efea9b50..6ba6ce2f 100644
--- a/daily-psk.local.rsc
+++ b/daily-psk.local.rsc
@@ -11,11 +11,11 @@
 #
 # !! Do not edit this file, it is generated from template!
 
-:global GlobalFunctionsReady;
-:while ($GlobalFunctionsReady != true) do={ :delay 500ms; }
-
 :local ExitOK false;
 :onerror Err {
+  :global GlobalFunctionsReady;
+  :retry { :if ($GlobalFunctionsReady != true) \
+      do={ :error ("Global functions not ready."); }; } delay=500ms max=50;
   :local ScriptName [ :jobname ];
 
   :global DailyPskMatchComment;
diff --git a/daily-psk.template.rsc b/daily-psk.template.rsc
index 5944c743..43ce3331 100644
--- a/daily-psk.template.rsc
+++ b/daily-psk.template.rsc
@@ -12,11 +12,11 @@
 # !! This is just a template to generate the real script!
 # !! Pattern '%TEMPL%' is replaced, paths are filtered.
 
-:global GlobalFunctionsReady;
-:while ($GlobalFunctionsReady != true) do={ :delay 500ms; }
-
 :local ExitOK false;
 :onerror Err {
+  :global GlobalFunctionsReady;
+  :retry { :if ($GlobalFunctionsReady != true) \
+      do={ :error ("Global functions not ready."); }; } delay=500ms max=50;
   :local ScriptName [ :jobname ];
 
   :global DailyPskMatchComment;
diff --git a/daily-psk.wifi.rsc b/daily-psk.wifi.rsc
index 050e9c27..7e1714dc 100644
--- a/daily-psk.wifi.rsc
+++ b/daily-psk.wifi.rsc
@@ -11,11 +11,11 @@
 #
 # !! Do not edit this file, it is generated from template!
 
-:global GlobalFunctionsReady;
-:while ($GlobalFunctionsReady != true) do={ :delay 500ms; }
-
 :local ExitOK false;
 :onerror Err {
+  :global GlobalFunctionsReady;
+  :retry { :if ($GlobalFunctionsReady != true) \
+      do={ :error ("Global functions not ready."); }; } delay=500ms max=50;
   :local ScriptName [ :jobname ];
 
   :global DailyPskMatchComment;

From 28c11b71f9e27fe88bd4efa5b26c2c0204406f7a Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Tue, 6 May 2025 11:15:15 +0200
Subject: [PATCH 067/129] dhcp-lease-comment: fail if global functions do not
 become ready

---
 dhcp-lease-comment.capsman.rsc  | 6 +++---
 dhcp-lease-comment.local.rsc    | 6 +++---
 dhcp-lease-comment.template.rsc | 6 +++---
 dhcp-lease-comment.wifi.rsc     | 6 +++---
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/dhcp-lease-comment.capsman.rsc b/dhcp-lease-comment.capsman.rsc
index 92495c91..724682b1 100644
--- a/dhcp-lease-comment.capsman.rsc
+++ b/dhcp-lease-comment.capsman.rsc
@@ -11,11 +11,11 @@
 #
 # !! Do not edit this file, it is generated from template!
 
-:global GlobalFunctionsReady;
-:while ($GlobalFunctionsReady != true) do={ :delay 500ms; }
-
 :local ExitOK false;
 :onerror Err {
+  :global GlobalFunctionsReady;
+  :retry { :if ($GlobalFunctionsReady != true) \
+      do={ :error ("Global functions not ready."); }; } delay=500ms max=50;
   :local ScriptName [ :jobname ];
 
   :global LogPrint;
diff --git a/dhcp-lease-comment.local.rsc b/dhcp-lease-comment.local.rsc
index 07802bc2..0a5f3b56 100644
--- a/dhcp-lease-comment.local.rsc
+++ b/dhcp-lease-comment.local.rsc
@@ -11,11 +11,11 @@
 #
 # !! Do not edit this file, it is generated from template!
 
-:global GlobalFunctionsReady;
-:while ($GlobalFunctionsReady != true) do={ :delay 500ms; }
-
 :local ExitOK false;
 :onerror Err {
+  :global GlobalFunctionsReady;
+  :retry { :if ($GlobalFunctionsReady != true) \
+      do={ :error ("Global functions not ready."); }; } delay=500ms max=50;
   :local ScriptName [ :jobname ];
 
   :global LogPrint;
diff --git a/dhcp-lease-comment.template.rsc b/dhcp-lease-comment.template.rsc
index 814e1d7c..71307b70 100644
--- a/dhcp-lease-comment.template.rsc
+++ b/dhcp-lease-comment.template.rsc
@@ -12,11 +12,11 @@
 # !! This is just a template to generate the real script!
 # !! Pattern '%TEMPL%' is replaced, paths are filtered.
 
-:global GlobalFunctionsReady;
-:while ($GlobalFunctionsReady != true) do={ :delay 500ms; }
-
 :local ExitOK false;
 :onerror Err {
+  :global GlobalFunctionsReady;
+  :retry { :if ($GlobalFunctionsReady != true) \
+      do={ :error ("Global functions not ready."); }; } delay=500ms max=50;
   :local ScriptName [ :jobname ];
 
   :global LogPrint;
diff --git a/dhcp-lease-comment.wifi.rsc b/dhcp-lease-comment.wifi.rsc
index 92fb6b00..1f29f0b4 100644
--- a/dhcp-lease-comment.wifi.rsc
+++ b/dhcp-lease-comment.wifi.rsc
@@ -11,11 +11,11 @@
 #
 # !! Do not edit this file, it is generated from template!
 
-:global GlobalFunctionsReady;
-:while ($GlobalFunctionsReady != true) do={ :delay 500ms; }
-
 :local ExitOK false;
 :onerror Err {
+  :global GlobalFunctionsReady;
+  :retry { :if ($GlobalFunctionsReady != true) \
+      do={ :error ("Global functions not ready."); }; } delay=500ms max=50;
   :local ScriptName [ :jobname ];
 
   :global LogPrint;

From d53ad87cbae5cae4b0757be2bb4b5ea982583374 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Tue, 6 May 2025 11:15:15 +0200
Subject: [PATCH 068/129] dhcp-to-dns: fail if global functions do not become
 ready

---
 dhcp-to-dns.rsc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/dhcp-to-dns.rsc b/dhcp-to-dns.rsc
index b032071f..e66704b1 100644
--- a/dhcp-to-dns.rsc
+++ b/dhcp-to-dns.rsc
@@ -9,11 +9,11 @@
 # check DHCP leases and add/remove/update DNS entries
 # https://rsc.eworm.de/doc/dhcp-to-dns.md
 
-:global GlobalFunctionsReady;
-:while ($GlobalFunctionsReady != true) do={ :delay 500ms; }
-
 :local ExitOK false;
 :onerror Err {
+  :global GlobalFunctionsReady;
+  :retry { :if ($GlobalFunctionsReady != true) \
+      do={ :error ("Global functions not ready."); }; } delay=500ms max=50;
   :local ScriptName [ :jobname ];
 
   :global Domain;

From a15e8c5b0da111c497304aa8cfacf5ba0231341d Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Tue, 6 May 2025 11:15:15 +0200
Subject: [PATCH 069/129] firmware-upgrade-reboot: fail if global functions do
 not become ready

---
 firmware-upgrade-reboot.rsc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/firmware-upgrade-reboot.rsc b/firmware-upgrade-reboot.rsc
index 9c3ba76b..d5774db1 100644
--- a/firmware-upgrade-reboot.rsc
+++ b/firmware-upgrade-reboot.rsc
@@ -8,11 +8,11 @@
 # install firmware upgrade, and reboot
 # https://rsc.eworm.de/doc/firmware-upgrade-reboot.md
 
-:global GlobalFunctionsReady;
-:while ($GlobalFunctionsReady != true) do={ :delay 500ms; }
-
 :local ExitOK false;
 :onerror Err {
+  :global GlobalFunctionsReady;
+  :retry { :if ($GlobalFunctionsReady != true) \
+      do={ :error ("Global functions not ready."); }; } delay=500ms max=50;
   :local ScriptName [ :jobname ];
 
   :global LogPrint;

From 6bb7f9a55e3ceb5b5a66df8d1e6fc18a6bce3e44 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Tue, 6 May 2025 11:15:15 +0200
Subject: [PATCH 070/129] fw-addr-lists: fail if global functions do not become
 ready

---
 fw-addr-lists.rsc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/fw-addr-lists.rsc b/fw-addr-lists.rsc
index 0fd79c1b..1a892dac 100644
--- a/fw-addr-lists.rsc
+++ b/fw-addr-lists.rsc
@@ -8,11 +8,11 @@
 # download, import and update firewall address-lists
 # https://rsc.eworm.de/doc/fw-addr-lists.md
 
-:global GlobalFunctionsReady;
-:while ($GlobalFunctionsReady != true) do={ :delay 500ms; }
-
 :local ExitOK false;
 :onerror Err {
+  :global GlobalFunctionsReady;
+  :retry { :if ($GlobalFunctionsReady != true) \
+      do={ :error ("Global functions not ready."); }; } delay=500ms max=50;
   :local ScriptName [ :jobname ];
 
   :global FwAddrLists;

From a1de285ae00b90f3f1a540b4789b7332f87d88e9 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Tue, 6 May 2025 11:15:15 +0200
Subject: [PATCH 071/129] gps-track: fail if global functions do not become
 ready

---
 gps-track.rsc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gps-track.rsc b/gps-track.rsc
index bd280c9b..d66bf009 100644
--- a/gps-track.rsc
+++ b/gps-track.rsc
@@ -9,11 +9,11 @@
 # track gps data by sending json data to http server
 # https://rsc.eworm.de/doc/gps-track.md
 
-:global GlobalFunctionsReady;
-:while ($GlobalFunctionsReady != true) do={ :delay 500ms; }
-
 :local ExitOK false;
 :onerror Err {
+  :global GlobalFunctionsReady;
+  :retry { :if ($GlobalFunctionsReady != true) \
+      do={ :error ("Global functions not ready."); }; } delay=500ms max=50;
   :local ScriptName [ :jobname ];
 
   :global GpsTrackUrl;

From 42a69ffb0dc25714588adc4f6d35e233936274ad Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Tue, 6 May 2025 11:15:15 +0200
Subject: [PATCH 072/129] hotspot-to-wpa-cleanup: fail if global functions do
 not become ready

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

diff --git a/hotspot-to-wpa-cleanup.capsman.rsc b/hotspot-to-wpa-cleanup.capsman.rsc
index 6cd1bfbc..fd0e5545 100644
--- a/hotspot-to-wpa-cleanup.capsman.rsc
+++ b/hotspot-to-wpa-cleanup.capsman.rsc
@@ -12,11 +12,11 @@
 #
 # !! Do not edit this file, it is generated from template!
 
-:global GlobalFunctionsReady;
-:while ($GlobalFunctionsReady != true) do={ :delay 500ms; }
-
 :local ExitOK false;
 :onerror Err {
+  :global GlobalFunctionsReady;
+  :retry { :if ($GlobalFunctionsReady != true) \
+      do={ :error ("Global functions not ready."); }; } delay=500ms max=50;
   :local ScriptName [ :jobname ];
 
   :global EitherOr;
diff --git a/hotspot-to-wpa-cleanup.template.rsc b/hotspot-to-wpa-cleanup.template.rsc
index 18d6beae..11f359cc 100644
--- a/hotspot-to-wpa-cleanup.template.rsc
+++ b/hotspot-to-wpa-cleanup.template.rsc
@@ -13,11 +13,11 @@
 # !! This is just a template to generate the real script!
 # !! Pattern '%TEMPL%' is replaced, paths are filtered.
 
-:global GlobalFunctionsReady;
-:while ($GlobalFunctionsReady != true) do={ :delay 500ms; }
-
 :local ExitOK false;
 :onerror Err {
+  :global GlobalFunctionsReady;
+  :retry { :if ($GlobalFunctionsReady != true) \
+      do={ :error ("Global functions not ready."); }; } delay=500ms max=50;
   :local ScriptName [ :jobname ];
 
   :global EitherOr;
diff --git a/hotspot-to-wpa-cleanup.wifi.rsc b/hotspot-to-wpa-cleanup.wifi.rsc
index 6348f74f..7f0ebae8 100644
--- a/hotspot-to-wpa-cleanup.wifi.rsc
+++ b/hotspot-to-wpa-cleanup.wifi.rsc
@@ -12,11 +12,11 @@
 #
 # !! Do not edit this file, it is generated from template!
 
-:global GlobalFunctionsReady;
-:while ($GlobalFunctionsReady != true) do={ :delay 500ms; }
-
 :local ExitOK false;
 :onerror Err {
+  :global GlobalFunctionsReady;
+  :retry { :if ($GlobalFunctionsReady != true) \
+      do={ :error ("Global functions not ready."); }; } delay=500ms max=50;
   :local ScriptName [ :jobname ];
 
   :global EitherOr;

From 6065460207eb9ef5997cf08af69b93d8c3f3625b Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Tue, 6 May 2025 11:15:15 +0200
Subject: [PATCH 073/129] hotspot-to-wpa: fail if global functions do not
 become ready

---
 hotspot-to-wpa.capsman.rsc  | 6 +++---
 hotspot-to-wpa.template.rsc | 6 +++---
 hotspot-to-wpa.wifi.rsc     | 6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/hotspot-to-wpa.capsman.rsc b/hotspot-to-wpa.capsman.rsc
index 54724cff..a9a14075 100644
--- a/hotspot-to-wpa.capsman.rsc
+++ b/hotspot-to-wpa.capsman.rsc
@@ -11,11 +11,11 @@
 #
 # !! Do not edit this file, it is generated from template!
 
-:global GlobalFunctionsReady;
-:while ($GlobalFunctionsReady != true) do={ :delay 500ms; }
-
 :local ExitOK false;
 :onerror Err {
+  :global GlobalFunctionsReady;
+  :retry { :if ($GlobalFunctionsReady != true) \
+      do={ :error ("Global functions not ready."); }; } delay=500ms max=50;
   :local ScriptName [ :jobname ];
 
   :global EitherOr;
diff --git a/hotspot-to-wpa.template.rsc b/hotspot-to-wpa.template.rsc
index 6764af9f..84a43bcc 100644
--- a/hotspot-to-wpa.template.rsc
+++ b/hotspot-to-wpa.template.rsc
@@ -12,11 +12,11 @@
 # !! This is just a template to generate the real script!
 # !! Pattern '%TEMPL%' is replaced, paths are filtered.
 
-:global GlobalFunctionsReady;
-:while ($GlobalFunctionsReady != true) do={ :delay 500ms; }
-
 :local ExitOK false;
 :onerror Err {
+  :global GlobalFunctionsReady;
+  :retry { :if ($GlobalFunctionsReady != true) \
+      do={ :error ("Global functions not ready."); }; } delay=500ms max=50;
   :local ScriptName [ :jobname ];
 
   :global EitherOr;
diff --git a/hotspot-to-wpa.wifi.rsc b/hotspot-to-wpa.wifi.rsc
index e74081ae..5c5afdab 100644
--- a/hotspot-to-wpa.wifi.rsc
+++ b/hotspot-to-wpa.wifi.rsc
@@ -11,11 +11,11 @@
 #
 # !! Do not edit this file, it is generated from template!
 
-:global GlobalFunctionsReady;
-:while ($GlobalFunctionsReady != true) do={ :delay 500ms; }
-
 :local ExitOK false;
 :onerror Err {
+  :global GlobalFunctionsReady;
+  :retry { :if ($GlobalFunctionsReady != true) \
+      do={ :error ("Global functions not ready."); }; } delay=500ms max=50;
   :local ScriptName [ :jobname ];
 
   :global EitherOr;

From e875b49fe046259f0c8f4ff7e128a63c3c146f6a Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Tue, 6 May 2025 11:15:15 +0200
Subject: [PATCH 074/129] ipsec-to-dns: fail if global functions do not become
 ready

---
 ipsec-to-dns.rsc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ipsec-to-dns.rsc b/ipsec-to-dns.rsc
index a2739328..fb7b55c1 100644
--- a/ipsec-to-dns.rsc
+++ b/ipsec-to-dns.rsc
@@ -9,11 +9,11 @@
 # and add/remove/update DNS entries from IPSec mode-config
 # https://rsc.eworm.de/doc/ipsec-to-dns.md
 
-:global GlobalFunctionsReady;
-:while ($GlobalFunctionsReady != true) do={ :delay 500ms; }
-
 :local ExitOK false;
 :onerror Err {
+  :global GlobalFunctionsReady;
+  :retry { :if ($GlobalFunctionsReady != true) \
+      do={ :error ("Global functions not ready."); }; } delay=500ms max=50;
   :local ScriptName [ :jobname ];
 
   :global Domain;

From 45fc4b1499f3311c6fe68f54ec9964590fc0bb86 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Tue, 6 May 2025 11:15:15 +0200
Subject: [PATCH 075/129] ipv6-update: fail if global functions do not become
 ready

---
 ipv6-update.rsc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ipv6-update.rsc b/ipv6-update.rsc
index 633919d3..24167c01 100644
--- a/ipv6-update.rsc
+++ b/ipv6-update.rsc
@@ -8,11 +8,11 @@
 # update firewall and dns settings on IPv6 prefix change
 # https://rsc.eworm.de/doc/ipv6-update.md
 
-:global GlobalFunctionsReady;
-:while ($GlobalFunctionsReady != true) do={ :delay 500ms; }
-
 :local ExitOK false;
 :onerror Err {
+  :global GlobalFunctionsReady;
+  :retry { :if ($GlobalFunctionsReady != true) \
+      do={ :error ("Global functions not ready."); }; } delay=500ms max=50;
   :local ScriptName [ :jobname ];
 
   :global LogPrint;

From f7b99f32eb530b72a0c5e14fa676515d320ba03f Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Tue, 6 May 2025 11:15:15 +0200
Subject: [PATCH 076/129] lease-script: fail if global functions do not become
 ready

---
 lease-script.rsc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lease-script.rsc b/lease-script.rsc
index 309337c7..501e0470 100644
--- a/lease-script.rsc
+++ b/lease-script.rsc
@@ -8,11 +8,11 @@
 # run scripts on DHCP lease
 # https://rsc.eworm.de/doc/lease-script.md
 
-:global GlobalFunctionsReady;
-:while ($GlobalFunctionsReady != true) do={ :delay 500ms; }
-
 :local ExitOK false;
 :onerror Err {
+  :global GlobalFunctionsReady;
+  :retry { :if ($GlobalFunctionsReady != true) \
+      do={ :error ("Global functions not ready."); }; } delay=500ms max=50;
   :local ScriptName [ :jobname ];
 
   :global Grep;

From afb2897ff62553e5586a632d7e24baa6184458d2 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Tue, 6 May 2025 11:15:15 +0200
Subject: [PATCH 077/129] log-forward: fail if global functions do not become
 ready

---
 log-forward.rsc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/log-forward.rsc b/log-forward.rsc
index 0ce420f2..3774dac7 100644
--- a/log-forward.rsc
+++ b/log-forward.rsc
@@ -8,11 +8,11 @@
 # forward log messages via notification
 # https://rsc.eworm.de/doc/log-forward.md
 
-:global GlobalFunctionsReady;
-:while ($GlobalFunctionsReady != true) do={ :delay 500ms; }
-
 :local ExitOK false;
 :onerror Err {
+  :global GlobalFunctionsReady;
+  :retry { :if ($GlobalFunctionsReady != true) \
+      do={ :error ("Global functions not ready."); }; } delay=500ms max=50;
   :local ScriptName [ :jobname ];
 
   :global Identity;

From 873137ef1e9e3dd2182ad0c86c1d3b2bfeb34dbe Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Tue, 6 May 2025 11:15:15 +0200
Subject: [PATCH 078/129] mode-button: fail if global functions do not become
 ready

---
 mode-button.rsc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/mode-button.rsc b/mode-button.rsc
index 2b773bc2..6d8b7b3a 100644
--- a/mode-button.rsc
+++ b/mode-button.rsc
@@ -9,11 +9,11 @@
 # act on multiple mode and reset button presses
 # https://rsc.eworm.de/doc/mode-button.md
 
-:global GlobalFunctionsReady;
-:while ($GlobalFunctionsReady != true) do={ :delay 500ms; }
-
 :local ExitOK false;
 :onerror Err {
+  :global GlobalFunctionsReady;
+  :retry { :if ($GlobalFunctionsReady != true) \
+      do={ :error ("Global functions not ready."); }; } delay=500ms max=50;
   :local ScriptName [ :jobname ];
 
   :global ModeButton;

From 8412a86ec3d4b86ea055227bd494f0f4f6083ebe Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Tue, 6 May 2025 11:15:15 +0200
Subject: [PATCH 079/129] netwatch-dns: fail if global functions do not become
 ready

---
 netwatch-dns.rsc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/netwatch-dns.rsc b/netwatch-dns.rsc
index 1d2d86b2..5a928f0a 100644
--- a/netwatch-dns.rsc
+++ b/netwatch-dns.rsc
@@ -9,11 +9,11 @@
 # monitor and manage dns/doh with netwatch
 # https://rsc.eworm.de/doc/netwatch-dns.md
 
-:global GlobalFunctionsReady;
-:while ($GlobalFunctionsReady != true) do={ :delay 500ms; }
-
 :local ExitOK false;
 :onerror Err {
+  :global GlobalFunctionsReady;
+  :retry { :if ($GlobalFunctionsReady != true) \
+      do={ :error ("Global functions not ready."); }; } delay=500ms max=50;
   :local ScriptName [ :jobname ];
 
   :global CertificateAvailable;

From 42919aab4b1e15e4821f8ce5b5f4abc1119f13cb Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Tue, 6 May 2025 11:15:15 +0200
Subject: [PATCH 080/129] netwatch-notify: fail if global functions do not
 become ready

---
 netwatch-notify.rsc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/netwatch-notify.rsc b/netwatch-notify.rsc
index d256689a..0c483305 100644
--- a/netwatch-notify.rsc
+++ b/netwatch-notify.rsc
@@ -8,11 +8,11 @@
 # monitor netwatch and send notifications
 # https://rsc.eworm.de/doc/netwatch-notify.md
 
-:global GlobalFunctionsReady;
-:while ($GlobalFunctionsReady != true) do={ :delay 500ms; }
-
 :local ExitOK false;
 :onerror Err {
+  :global GlobalFunctionsReady;
+  :retry { :if ($GlobalFunctionsReady != true) \
+      do={ :error ("Global functions not ready."); }; } delay=500ms max=50;
   :local ScriptName [ :jobname ];
 
   :global NetwatchNotify;

From 0542896d6cbc3c5af6a6099e65709ba0ce9286a9 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Tue, 6 May 2025 11:15:15 +0200
Subject: [PATCH 081/129] ospf-to-leds: fail if global functions do not become
 ready

---
 ospf-to-leds.rsc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ospf-to-leds.rsc b/ospf-to-leds.rsc
index e2f4dcf6..cdc06e55 100644
--- a/ospf-to-leds.rsc
+++ b/ospf-to-leds.rsc
@@ -8,11 +8,11 @@
 # visualize ospf instance state via leds
 # https://rsc.eworm.de/doc/ospf-to-leds.md
 
-:global GlobalFunctionsReady;
-:while ($GlobalFunctionsReady != true) do={ :delay 500ms; }
-
 :local ExitOK false;
 :onerror Err {
+  :global GlobalFunctionsReady;
+  :retry { :if ($GlobalFunctionsReady != true) \
+      do={ :error ("Global functions not ready."); }; } delay=500ms max=50;
   :local ScriptName [ :jobname ];
 
   :global LogPrint;

From b4d90d8e66e05229b8ae6c4729a5ca93a74ee5af Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Tue, 6 May 2025 11:15:15 +0200
Subject: [PATCH 082/129] packages-update: fail if global functions do not
 become ready

---
 packages-update.rsc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages-update.rsc b/packages-update.rsc
index dce7cca4..81a6d132 100644
--- a/packages-update.rsc
+++ b/packages-update.rsc
@@ -9,11 +9,11 @@
 # download packages and reboot for installation
 # https://rsc.eworm.de/doc/packages-update.md
 
-:global GlobalFunctionsReady;
-:while ($GlobalFunctionsReady != true) do={ :delay 500ms; }
-
 :local ExitOK false;
 :onerror Err {
+  :global GlobalFunctionsReady;
+  :retry { :if ($GlobalFunctionsReady != true) \
+      do={ :error ("Global functions not ready."); }; } delay=500ms max=50;
   :local ScriptName [ :jobname ];
 
   :global BackupRandomDelay;

From 2174f35d637e49f7e66bfcf1a3bf787e44ac608a Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Tue, 6 May 2025 11:15:15 +0200
Subject: [PATCH 083/129] ppp-on-up: fail if global functions do not become
 ready

---
 ppp-on-up.rsc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ppp-on-up.rsc b/ppp-on-up.rsc
index ffe3079c..ef08c9d8 100644
--- a/ppp-on-up.rsc
+++ b/ppp-on-up.rsc
@@ -8,11 +8,11 @@
 # run scripts on ppp up
 # https://rsc.eworm.de/doc/ppp-on-up.md
 
-:global GlobalFunctionsReady;
-:while ($GlobalFunctionsReady != true) do={ :delay 500ms; }
-
 :local ExitOK false;
 :onerror Err {
+  :global GlobalFunctionsReady;
+  :retry { :if ($GlobalFunctionsReady != true) \
+      do={ :error ("Global functions not ready."); }; } delay=500ms max=50;
   :local ScriptName [ :jobname ];
 
   :global LogPrint;

From fdd201e069cfc957745a7644285ff2f042a5f82e Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Tue, 6 May 2025 11:15:15 +0200
Subject: [PATCH 084/129] sms-action: fail if global functions do not become
 ready

---
 sms-action.rsc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/sms-action.rsc b/sms-action.rsc
index d5bd5531..0f02bcec 100644
--- a/sms-action.rsc
+++ b/sms-action.rsc
@@ -8,11 +8,11 @@
 # run action on received SMS
 # https://rsc.eworm.de/doc/sms-action.md
 
-:global GlobalFunctionsReady;
-:while ($GlobalFunctionsReady != true) do={ :delay 500ms; }
-
 :local ExitOK false;
 :onerror Err {
+  :global GlobalFunctionsReady;
+  :retry { :if ($GlobalFunctionsReady != true) \
+      do={ :error ("Global functions not ready."); }; } delay=500ms max=50;
   :local ScriptName [ :jobname ];
 
   :global SmsAction;

From 8ed3d57e10964ea20d3c46f4609bba4fb1d00d50 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Tue, 6 May 2025 11:15:15 +0200
Subject: [PATCH 085/129] sms-forward: fail if global functions do not become
 ready

---
 sms-forward.rsc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/sms-forward.rsc b/sms-forward.rsc
index ddaa3a8c..9c3e4a55 100644
--- a/sms-forward.rsc
+++ b/sms-forward.rsc
@@ -9,11 +9,11 @@
 # forward SMS to e-mail
 # https://rsc.eworm.de/doc/sms-forward.md
 
-:global GlobalFunctionsReady;
-:while ($GlobalFunctionsReady != true) do={ :delay 500ms; }
-
 :local ExitOK false;
 :onerror Err {
+  :global GlobalFunctionsReady;
+  :retry { :if ($GlobalFunctionsReady != true) \
+      do={ :error ("Global functions not ready."); }; } delay=500ms max=50;
   :local ScriptName [ :jobname ];
 
   :global Identity;

From 2ea8f630aa94dc45f2d24460ef68bab68dfd55f6 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Tue, 6 May 2025 11:15:15 +0200
Subject: [PATCH 086/129] telegram-chat: fail if global functions do not become
 ready

---
 telegram-chat.rsc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/telegram-chat.rsc b/telegram-chat.rsc
index 155bb023..f62034c1 100644
--- a/telegram-chat.rsc
+++ b/telegram-chat.rsc
@@ -9,11 +9,11 @@
 # use Telegram to chat with your Router and send commands
 # https://rsc.eworm.de/doc/telegram-chat.md
 
-:global GlobalFunctionsReady;
-:while ($GlobalFunctionsReady != true) do={ :delay 500ms; }
-
 :local ExitOK false;
 :onerror Err {
+  :global GlobalFunctionsReady;
+  :retry { :if ($GlobalFunctionsReady != true) \
+      do={ :error ("Global functions not ready."); }; } delay=500ms max=50;
   :local ScriptName [ :jobname ];
 
   :global Identity;

From d751908e340c15ba259797b43138dd87a5721c37 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Tue, 6 May 2025 11:15:15 +0200
Subject: [PATCH 087/129] update-gre-address: fail if global functions do not
 become ready

---
 update-gre-address.rsc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/update-gre-address.rsc b/update-gre-address.rsc
index 2570f80a..8d98eaa7 100644
--- a/update-gre-address.rsc
+++ b/update-gre-address.rsc
@@ -9,11 +9,11 @@
 # ipsec remote peer
 # https://rsc.eworm.de/doc/update-gre-address.md
 
-:global GlobalFunctionsReady;
-:while ($GlobalFunctionsReady != true) do={ :delay 500ms; }
-
 :local ExitOK false;
 :onerror Err {
+  :global GlobalFunctionsReady;
+  :retry { :if ($GlobalFunctionsReady != true) \
+      do={ :error ("Global functions not ready."); }; } delay=500ms max=50;
   :local ScriptName [ :jobname ];
 
   :global CharacterReplace;

From b9f945c1e1faac24469d160f36a95918ee8bf0a6 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Tue, 6 May 2025 11:15:15 +0200
Subject: [PATCH 088/129] update-tunnelbroker: fail if global functions do not
 become ready

---
 update-tunnelbroker.rsc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/update-tunnelbroker.rsc b/update-tunnelbroker.rsc
index 10adef0b..2deb5b22 100644
--- a/update-tunnelbroker.rsc
+++ b/update-tunnelbroker.rsc
@@ -11,11 +11,11 @@
 # update local address of tunnelbroker interface
 # https://rsc.eworm.de/doc/update-tunnelbroker.md
 
-:global GlobalFunctionsReady;
-:while ($GlobalFunctionsReady != true) do={ :delay 500ms; }
-
 :local ExitOK false;
 :onerror Err {
+  :global GlobalFunctionsReady;
+  :retry { :if ($GlobalFunctionsReady != true) \
+      do={ :error ("Global functions not ready."); }; } delay=500ms max=50;
   :local ScriptName [ :jobname ];
 
   :global CertificateAvailable;

From 3c2043f1bc0ffb7656e5f36af1fc7598b962efc1 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Tue, 6 May 2025 13:52:57 +0200
Subject: [PATCH 089/129] global-config: introduce a state variable

---
 global-config.rsc | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/global-config.rsc b/global-config.rsc
index 42a457a5..c0577ff6 100644
--- a/global-config.rsc
+++ b/global-config.rsc
@@ -6,6 +6,9 @@
 # global configuration
 # https://rsc.eworm.de/
 
+# Warning: Do *NOT* copy this line to overlay!
+:global GlobalConfigReady false;
+
 # Set this to 'true' to disable news and change notifications.
 :global NoNewsAndChangesNotification false;
 
@@ -275,3 +278,6 @@
         [ /system/script/get $Script name ] . " failed!");
   }
 }
+
+# signal we are ready
+:set GlobalConfigReady true;

From 7ca4e05913795a362ce3694e55ffb00649de7cba Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Tue, 6 May 2025 14:08:36 +0200
Subject: [PATCH 090/129] accesslist-duplicates: check for global config to be
 ready

---
 accesslist-duplicates.capsman.rsc  | 6 +++---
 accesslist-duplicates.local.rsc    | 6 +++---
 accesslist-duplicates.template.rsc | 6 +++---
 accesslist-duplicates.wifi.rsc     | 6 +++---
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/accesslist-duplicates.capsman.rsc b/accesslist-duplicates.capsman.rsc
index 545b24ea..5e6cf0a0 100644
--- a/accesslist-duplicates.capsman.rsc
+++ b/accesslist-duplicates.capsman.rsc
@@ -12,9 +12,9 @@
 
 :local ExitOK false;
 :onerror Err {
-  :global GlobalFunctionsReady;
-  :retry { :if ($GlobalFunctionsReady != true) \
-      do={ :error ("Global functions not ready."); }; } delay=500ms max=50;
+  :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 ];
 
   :local Seen ({});
diff --git a/accesslist-duplicates.local.rsc b/accesslist-duplicates.local.rsc
index ac2c7fe3..a6b4f417 100644
--- a/accesslist-duplicates.local.rsc
+++ b/accesslist-duplicates.local.rsc
@@ -12,9 +12,9 @@
 
 :local ExitOK false;
 :onerror Err {
-  :global GlobalFunctionsReady;
-  :retry { :if ($GlobalFunctionsReady != true) \
-      do={ :error ("Global functions not ready."); }; } delay=500ms max=50;
+  :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 ];
 
   :local Seen ({});
diff --git a/accesslist-duplicates.template.rsc b/accesslist-duplicates.template.rsc
index 89559918..e51198d8 100644
--- a/accesslist-duplicates.template.rsc
+++ b/accesslist-duplicates.template.rsc
@@ -13,9 +13,9 @@
 
 :local ExitOK false;
 :onerror Err {
-  :global GlobalFunctionsReady;
-  :retry { :if ($GlobalFunctionsReady != true) \
-      do={ :error ("Global functions not ready."); }; } delay=500ms max=50;
+  :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 ];
 
   :local Seen ({});
diff --git a/accesslist-duplicates.wifi.rsc b/accesslist-duplicates.wifi.rsc
index 331de751..cadacb6b 100644
--- a/accesslist-duplicates.wifi.rsc
+++ b/accesslist-duplicates.wifi.rsc
@@ -12,9 +12,9 @@
 
 :local ExitOK false;
 :onerror Err {
-  :global GlobalFunctionsReady;
-  :retry { :if ($GlobalFunctionsReady != true) \
-      do={ :error ("Global functions not ready."); }; } delay=500ms max=50;
+  :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 ];
 
   :local Seen ({});

From db2438f1557e8f60ffc8732ba3c689ca09ed6960 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Tue, 6 May 2025 14:08:36 +0200
Subject: [PATCH 091/129] backup-cloud: check for global config to be ready

---
 backup-cloud.rsc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/backup-cloud.rsc b/backup-cloud.rsc
index f0861f09..e41db275 100644
--- a/backup-cloud.rsc
+++ b/backup-cloud.rsc
@@ -11,9 +11,9 @@
 
 :local ExitOK false;
 :onerror Err {
-  :global GlobalFunctionsReady;
-  :retry { :if ($GlobalFunctionsReady != true) \
-      do={ :error ("Global functions not ready."); }; } delay=500ms max=50;
+  :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 BackupRandomDelay;

From 049211826334738a69d58979efda4294f6df1e50 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Tue, 6 May 2025 14:08:36 +0200
Subject: [PATCH 092/129] backup-email: check for global config to be ready

---
 backup-email.rsc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/backup-email.rsc b/backup-email.rsc
index da2ee02d..632d2e60 100644
--- a/backup-email.rsc
+++ b/backup-email.rsc
@@ -11,9 +11,9 @@
 
 :local ExitOK false;
 :onerror Err {
-  :global GlobalFunctionsReady;
-  :retry { :if ($GlobalFunctionsReady != true) \
-      do={ :error ("Global functions not ready."); }; } delay=500ms max=50;
+  :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 BackupPassword;

From 198a7a03dc343dffb6e2ce0251a198df6bda629e Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Tue, 6 May 2025 14:08:36 +0200
Subject: [PATCH 093/129] backup-partition: check for global config to be ready

---
 backup-partition.rsc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/backup-partition.rsc b/backup-partition.rsc
index f99a66c1..c2221d2c 100644
--- a/backup-partition.rsc
+++ b/backup-partition.rsc
@@ -12,9 +12,9 @@
 
 :local ExitOK false;
 :onerror Err {
-  :global GlobalFunctionsReady;
-  :retry { :if ($GlobalFunctionsReady != true) \
-      do={ :error ("Global functions not ready."); }; } delay=500ms max=50;
+  :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 BackupPartitionCopyBeforeFeatureUpdate;

From dc546f68da6d81f5d1c20c6caf5788044a80fdb5 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Tue, 6 May 2025 14:08:36 +0200
Subject: [PATCH 094/129] backup-upload: check for global config to be ready

---
 backup-upload.rsc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/backup-upload.rsc b/backup-upload.rsc
index 9373b4c1..11ced4ca 100644
--- a/backup-upload.rsc
+++ b/backup-upload.rsc
@@ -12,9 +12,9 @@
 
 :local ExitOK false;
 :onerror Err {
-  :global GlobalFunctionsReady;
-  :retry { :if ($GlobalFunctionsReady != true) \
-      do={ :error ("Global functions not ready."); }; } delay=500ms max=50;
+  :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 BackupPassword;

From 3af2ff3d93c79913595ff621d3af92e40f9b54b5 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Tue, 6 May 2025 14:08:36 +0200
Subject: [PATCH 095/129] capsman-download-packages: check for global config to
 be ready

---
 capsman-download-packages.capsman.rsc  | 6 +++---
 capsman-download-packages.template.rsc | 6 +++---
 capsman-download-packages.wifi.rsc     | 6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/capsman-download-packages.capsman.rsc b/capsman-download-packages.capsman.rsc
index ee826386..cab1e4c3 100644
--- a/capsman-download-packages.capsman.rsc
+++ b/capsman-download-packages.capsman.rsc
@@ -13,9 +13,9 @@
 
 :local ExitOK false;
 :onerror Err {
-  :global GlobalFunctionsReady;
-  :retry { :if ($GlobalFunctionsReady != true) \
-      do={ :error ("Global functions not ready."); }; } delay=500ms max=50;
+  :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 CleanFilePath;
diff --git a/capsman-download-packages.template.rsc b/capsman-download-packages.template.rsc
index 91a9167c..ea411201 100644
--- a/capsman-download-packages.template.rsc
+++ b/capsman-download-packages.template.rsc
@@ -14,9 +14,9 @@
 
 :local ExitOK false;
 :onerror Err {
-  :global GlobalFunctionsReady;
-  :retry { :if ($GlobalFunctionsReady != true) \
-      do={ :error ("Global functions not ready."); }; } delay=500ms max=50;
+  :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 CleanFilePath;
diff --git a/capsman-download-packages.wifi.rsc b/capsman-download-packages.wifi.rsc
index cb6cb6f4..a8103569 100644
--- a/capsman-download-packages.wifi.rsc
+++ b/capsman-download-packages.wifi.rsc
@@ -13,9 +13,9 @@
 
 :local ExitOK false;
 :onerror Err {
-  :global GlobalFunctionsReady;
-  :retry { :if ($GlobalFunctionsReady != true) \
-      do={ :error ("Global functions not ready."); }; } delay=500ms max=50;
+  :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 CleanFilePath;

From 05113e70516fcee71dfe3374b2c879da7e72bdfa Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Tue, 6 May 2025 14:08:36 +0200
Subject: [PATCH 096/129] capsman-rolling-upgrade: check for global config to
 be ready

---
 capsman-rolling-upgrade.capsman.rsc  | 6 +++---
 capsman-rolling-upgrade.template.rsc | 6 +++---
 capsman-rolling-upgrade.wifi.rsc     | 6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/capsman-rolling-upgrade.capsman.rsc b/capsman-rolling-upgrade.capsman.rsc
index 20978802..0d4114a3 100644
--- a/capsman-rolling-upgrade.capsman.rsc
+++ b/capsman-rolling-upgrade.capsman.rsc
@@ -14,9 +14,9 @@
 
 :local ExitOK false;
 :onerror Err {
-  :global GlobalFunctionsReady;
-  :retry { :if ($GlobalFunctionsReady != true) \
-      do={ :error ("Global functions not ready."); }; } delay=500ms max=50;
+  :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 LogPrint;
diff --git a/capsman-rolling-upgrade.template.rsc b/capsman-rolling-upgrade.template.rsc
index 75de088f..690d73d8 100644
--- a/capsman-rolling-upgrade.template.rsc
+++ b/capsman-rolling-upgrade.template.rsc
@@ -15,9 +15,9 @@
 
 :local ExitOK false;
 :onerror Err {
-  :global GlobalFunctionsReady;
-  :retry { :if ($GlobalFunctionsReady != true) \
-      do={ :error ("Global functions not ready."); }; } delay=500ms max=50;
+  :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 LogPrint;
diff --git a/capsman-rolling-upgrade.wifi.rsc b/capsman-rolling-upgrade.wifi.rsc
index e6c6facb..8e32ab20 100644
--- a/capsman-rolling-upgrade.wifi.rsc
+++ b/capsman-rolling-upgrade.wifi.rsc
@@ -14,9 +14,9 @@
 
 :local ExitOK false;
 :onerror Err {
-  :global GlobalFunctionsReady;
-  :retry { :if ($GlobalFunctionsReady != true) \
-      do={ :error ("Global functions not ready."); }; } delay=500ms max=50;
+  :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 LogPrint;

From 3304f4845137276805939a850b32d8245db0083a Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Tue, 6 May 2025 14:08:37 +0200
Subject: [PATCH 097/129] certificate-renew-issued: check for global config to
 be ready

---
 certificate-renew-issued.rsc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/certificate-renew-issued.rsc b/certificate-renew-issued.rsc
index 3fd60208..14917e4c 100644
--- a/certificate-renew-issued.rsc
+++ b/certificate-renew-issued.rsc
@@ -10,9 +10,9 @@
 
 :local ExitOK false;
 :onerror Err {
-  :global GlobalFunctionsReady;
-  :retry { :if ($GlobalFunctionsReady != true) \
-      do={ :error ("Global functions not ready."); }; } delay=500ms max=50;
+  :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 CertIssuedExportPass;

From a7ab629716a8b7881d5ee4597d9523638e4a7086 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Tue, 6 May 2025 14:08:37 +0200
Subject: [PATCH 098/129] check-certificates: check for global config to be
 ready

---
 check-certificates.rsc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/check-certificates.rsc b/check-certificates.rsc
index 505ec4b0..c10e33ba 100644
--- a/check-certificates.rsc
+++ b/check-certificates.rsc
@@ -11,9 +11,9 @@
 
 :local ExitOK false;
 :onerror Err {
-  :global GlobalFunctionsReady;
-  :retry { :if ($GlobalFunctionsReady != true) \
-      do={ :error ("Global functions not ready."); }; } delay=500ms max=50;
+  :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 CertRenewTime;

From f1a367118e3de32acaf4375b41ce1f83e660576a Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Tue, 6 May 2025 14:08:37 +0200
Subject: [PATCH 099/129] check-health: check for global config to be ready

---
 check-health.rsc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/check-health.rsc b/check-health.rsc
index 40ce101d..1b92d1e4 100644
--- a/check-health.rsc
+++ b/check-health.rsc
@@ -10,9 +10,9 @@
 
 :local ExitOK false;
 :onerror Err {
-  :global GlobalFunctionsReady;
-  :retry { :if ($GlobalFunctionsReady != true) \
-      do={ :error ("Global functions not ready."); }; } delay=500ms max=50;
+  :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 CheckHealthCPUUtilization;

From cfa972ac87d2cc92d275ac3f3b394e086d4f8e95 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Tue, 6 May 2025 14:08:37 +0200
Subject: [PATCH 100/129] check-lte-firmware-upgrade: check for global config
 to be ready

---
 check-lte-firmware-upgrade.rsc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/check-lte-firmware-upgrade.rsc b/check-lte-firmware-upgrade.rsc
index 6030e4d4..1a5e08ce 100644
--- a/check-lte-firmware-upgrade.rsc
+++ b/check-lte-firmware-upgrade.rsc
@@ -10,9 +10,9 @@
 
 :local ExitOK false;
 :onerror Err {
-  :global GlobalFunctionsReady;
-  :retry { :if ($GlobalFunctionsReady != true) \
-      do={ :error ("Global functions not ready."); }; } delay=500ms max=50;
+  :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 SentLteFirmwareUpgradeNotification;

From ebd554da09375e3a24b99406762b6827eaf67973 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Tue, 6 May 2025 14:08:37 +0200
Subject: [PATCH 101/129] check-perpetual-license: check for global config to
 be ready

---
 check-perpetual-license.rsc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/check-perpetual-license.rsc b/check-perpetual-license.rsc
index d46f0b49..c2f0dff0 100644
--- a/check-perpetual-license.rsc
+++ b/check-perpetual-license.rsc
@@ -10,9 +10,9 @@
 
 :local ExitOK false;
 :onerror Err {
-  :global GlobalFunctionsReady;
-  :retry { :if ($GlobalFunctionsReady != true) \
-      do={ :error ("Global functions not ready."); }; } delay=500ms max=50;
+  :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 Identity;

From 5da0131a8e98239f56e01188a4723950f782f759 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Tue, 6 May 2025 14:08:37 +0200
Subject: [PATCH 102/129] check-routeros-update: check for global config to be
 ready

---
 check-routeros-update.rsc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/check-routeros-update.rsc b/check-routeros-update.rsc
index 932256ad..34d06475 100644
--- a/check-routeros-update.rsc
+++ b/check-routeros-update.rsc
@@ -11,9 +11,9 @@
 
 :local ExitOK false;
 :onerror Err {
-  :global GlobalFunctionsReady;
-  :retry { :if ($GlobalFunctionsReady != true) \
-      do={ :error ("Global functions not ready."); }; } delay=500ms max=50;
+  :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 Identity;

From 4718282cf18a6707442b63c6d09fe9efaff89fce Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Tue, 6 May 2025 14:08:37 +0200
Subject: [PATCH 103/129] collect-wireless-mac: check for global config to be
 ready

---
 collect-wireless-mac.capsman.rsc  | 6 +++---
 collect-wireless-mac.local.rsc    | 6 +++---
 collect-wireless-mac.template.rsc | 6 +++---
 collect-wireless-mac.wifi.rsc     | 6 +++---
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/collect-wireless-mac.capsman.rsc b/collect-wireless-mac.capsman.rsc
index fa6198a0..06b8d844 100644
--- a/collect-wireless-mac.capsman.rsc
+++ b/collect-wireless-mac.capsman.rsc
@@ -13,9 +13,9 @@
 
 :local ExitOK false;
 :onerror Err {
-  :global GlobalFunctionsReady;
-  :retry { :if ($GlobalFunctionsReady != true) \
-      do={ :error ("Global functions not ready."); }; } delay=500ms max=50;
+  :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 Identity;
diff --git a/collect-wireless-mac.local.rsc b/collect-wireless-mac.local.rsc
index 4082bbbe..6716582d 100644
--- a/collect-wireless-mac.local.rsc
+++ b/collect-wireless-mac.local.rsc
@@ -13,9 +13,9 @@
 
 :local ExitOK false;
 :onerror Err {
-  :global GlobalFunctionsReady;
-  :retry { :if ($GlobalFunctionsReady != true) \
-      do={ :error ("Global functions not ready."); }; } delay=500ms max=50;
+  :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 Identity;
diff --git a/collect-wireless-mac.template.rsc b/collect-wireless-mac.template.rsc
index 51671562..53e6b0a8 100644
--- a/collect-wireless-mac.template.rsc
+++ b/collect-wireless-mac.template.rsc
@@ -14,9 +14,9 @@
 
 :local ExitOK false;
 :onerror Err {
-  :global GlobalFunctionsReady;
-  :retry { :if ($GlobalFunctionsReady != true) \
-      do={ :error ("Global functions not ready."); }; } delay=500ms max=50;
+  :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 Identity;
diff --git a/collect-wireless-mac.wifi.rsc b/collect-wireless-mac.wifi.rsc
index af0dd8b2..43ac8519 100644
--- a/collect-wireless-mac.wifi.rsc
+++ b/collect-wireless-mac.wifi.rsc
@@ -13,9 +13,9 @@
 
 :local ExitOK false;
 :onerror Err {
-  :global GlobalFunctionsReady;
-  :retry { :if ($GlobalFunctionsReady != true) \
-      do={ :error ("Global functions not ready."); }; } delay=500ms max=50;
+  :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 Identity;

From 962c080c3f28009e4e9fa3568669dbfd066fc0c4 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Tue, 6 May 2025 14:08:37 +0200
Subject: [PATCH 104/129] daily-psk: check for global config to be ready

---
 daily-psk.capsman.rsc  | 6 +++---
 daily-psk.local.rsc    | 6 +++---
 daily-psk.template.rsc | 6 +++---
 daily-psk.wifi.rsc     | 6 +++---
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/daily-psk.capsman.rsc b/daily-psk.capsman.rsc
index a1b01fc8..3ecd6b66 100644
--- a/daily-psk.capsman.rsc
+++ b/daily-psk.capsman.rsc
@@ -13,9 +13,9 @@
 
 :local ExitOK false;
 :onerror Err {
-  :global GlobalFunctionsReady;
-  :retry { :if ($GlobalFunctionsReady != true) \
-      do={ :error ("Global functions not ready."); }; } delay=500ms max=50;
+  :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 DailyPskMatchComment;
diff --git a/daily-psk.local.rsc b/daily-psk.local.rsc
index 6ba6ce2f..d496350c 100644
--- a/daily-psk.local.rsc
+++ b/daily-psk.local.rsc
@@ -13,9 +13,9 @@
 
 :local ExitOK false;
 :onerror Err {
-  :global GlobalFunctionsReady;
-  :retry { :if ($GlobalFunctionsReady != true) \
-      do={ :error ("Global functions not ready."); }; } delay=500ms max=50;
+  :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 DailyPskMatchComment;
diff --git a/daily-psk.template.rsc b/daily-psk.template.rsc
index 43ce3331..5a1df2f1 100644
--- a/daily-psk.template.rsc
+++ b/daily-psk.template.rsc
@@ -14,9 +14,9 @@
 
 :local ExitOK false;
 :onerror Err {
-  :global GlobalFunctionsReady;
-  :retry { :if ($GlobalFunctionsReady != true) \
-      do={ :error ("Global functions not ready."); }; } delay=500ms max=50;
+  :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 DailyPskMatchComment;
diff --git a/daily-psk.wifi.rsc b/daily-psk.wifi.rsc
index 7e1714dc..c441e581 100644
--- a/daily-psk.wifi.rsc
+++ b/daily-psk.wifi.rsc
@@ -13,9 +13,9 @@
 
 :local ExitOK false;
 :onerror Err {
-  :global GlobalFunctionsReady;
-  :retry { :if ($GlobalFunctionsReady != true) \
-      do={ :error ("Global functions not ready."); }; } delay=500ms max=50;
+  :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 DailyPskMatchComment;

From bd9837815b7dd8126e26098f620f0a2df13aa261 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Tue, 6 May 2025 14:08:37 +0200
Subject: [PATCH 105/129] dhcp-lease-comment: check for global config to be
 ready

---
 dhcp-lease-comment.capsman.rsc  | 6 +++---
 dhcp-lease-comment.local.rsc    | 6 +++---
 dhcp-lease-comment.template.rsc | 6 +++---
 dhcp-lease-comment.wifi.rsc     | 6 +++---
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/dhcp-lease-comment.capsman.rsc b/dhcp-lease-comment.capsman.rsc
index 724682b1..3615bb9b 100644
--- a/dhcp-lease-comment.capsman.rsc
+++ b/dhcp-lease-comment.capsman.rsc
@@ -13,9 +13,9 @@
 
 :local ExitOK false;
 :onerror Err {
-  :global GlobalFunctionsReady;
-  :retry { :if ($GlobalFunctionsReady != true) \
-      do={ :error ("Global functions not ready."); }; } delay=500ms max=50;
+  :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 LogPrint;
diff --git a/dhcp-lease-comment.local.rsc b/dhcp-lease-comment.local.rsc
index 0a5f3b56..9da53336 100644
--- a/dhcp-lease-comment.local.rsc
+++ b/dhcp-lease-comment.local.rsc
@@ -13,9 +13,9 @@
 
 :local ExitOK false;
 :onerror Err {
-  :global GlobalFunctionsReady;
-  :retry { :if ($GlobalFunctionsReady != true) \
-      do={ :error ("Global functions not ready."); }; } delay=500ms max=50;
+  :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 LogPrint;
diff --git a/dhcp-lease-comment.template.rsc b/dhcp-lease-comment.template.rsc
index 71307b70..62cace12 100644
--- a/dhcp-lease-comment.template.rsc
+++ b/dhcp-lease-comment.template.rsc
@@ -14,9 +14,9 @@
 
 :local ExitOK false;
 :onerror Err {
-  :global GlobalFunctionsReady;
-  :retry { :if ($GlobalFunctionsReady != true) \
-      do={ :error ("Global functions not ready."); }; } delay=500ms max=50;
+  :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 LogPrint;
diff --git a/dhcp-lease-comment.wifi.rsc b/dhcp-lease-comment.wifi.rsc
index 1f29f0b4..667708cd 100644
--- a/dhcp-lease-comment.wifi.rsc
+++ b/dhcp-lease-comment.wifi.rsc
@@ -13,9 +13,9 @@
 
 :local ExitOK false;
 :onerror Err {
-  :global GlobalFunctionsReady;
-  :retry { :if ($GlobalFunctionsReady != true) \
-      do={ :error ("Global functions not ready."); }; } delay=500ms max=50;
+  :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 LogPrint;

From 7cf55d448dbe05fa08b79ab4343b215a7d6ec63c Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Tue, 6 May 2025 14:08:37 +0200
Subject: [PATCH 106/129] dhcp-to-dns: check for global config to be ready

---
 dhcp-to-dns.rsc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/dhcp-to-dns.rsc b/dhcp-to-dns.rsc
index e66704b1..a9c91e1c 100644
--- a/dhcp-to-dns.rsc
+++ b/dhcp-to-dns.rsc
@@ -11,9 +11,9 @@
 
 :local ExitOK false;
 :onerror Err {
-  :global GlobalFunctionsReady;
-  :retry { :if ($GlobalFunctionsReady != true) \
-      do={ :error ("Global functions not ready."); }; } delay=500ms max=50;
+  :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 Domain;

From daa2c76b065b4fb441141ec3fa05115cc7a0b6e1 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Tue, 6 May 2025 14:08:37 +0200
Subject: [PATCH 107/129] firmware-upgrade-reboot: check for global config to
 be ready

---
 firmware-upgrade-reboot.rsc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/firmware-upgrade-reboot.rsc b/firmware-upgrade-reboot.rsc
index d5774db1..e3ca55b3 100644
--- a/firmware-upgrade-reboot.rsc
+++ b/firmware-upgrade-reboot.rsc
@@ -10,9 +10,9 @@
 
 :local ExitOK false;
 :onerror Err {
-  :global GlobalFunctionsReady;
-  :retry { :if ($GlobalFunctionsReady != true) \
-      do={ :error ("Global functions not ready."); }; } delay=500ms max=50;
+  :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 LogPrint;

From c39c26b4697e91d2380fe1c97e3fa4cdf809d3b6 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Tue, 6 May 2025 14:08:37 +0200
Subject: [PATCH 108/129] fw-addr-lists: check for global config to be ready

---
 fw-addr-lists.rsc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/fw-addr-lists.rsc b/fw-addr-lists.rsc
index 1a892dac..4ee3c344 100644
--- a/fw-addr-lists.rsc
+++ b/fw-addr-lists.rsc
@@ -10,9 +10,9 @@
 
 :local ExitOK false;
 :onerror Err {
-  :global GlobalFunctionsReady;
-  :retry { :if ($GlobalFunctionsReady != true) \
-      do={ :error ("Global functions not ready."); }; } delay=500ms max=50;
+  :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 FwAddrLists;

From 56b2be45aac3db130cd8424ad835ded8df957855 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Tue, 6 May 2025 14:08:37 +0200
Subject: [PATCH 109/129] gps-track: check for global config to be ready

---
 gps-track.rsc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gps-track.rsc b/gps-track.rsc
index d66bf009..4cc50663 100644
--- a/gps-track.rsc
+++ b/gps-track.rsc
@@ -11,9 +11,9 @@
 
 :local ExitOK false;
 :onerror Err {
-  :global GlobalFunctionsReady;
-  :retry { :if ($GlobalFunctionsReady != true) \
-      do={ :error ("Global functions not ready."); }; } delay=500ms max=50;
+  :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 GpsTrackUrl;

From cdc71fd9a5c561806031bf855f731e35a6217739 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Tue, 6 May 2025 14:08:37 +0200
Subject: [PATCH 110/129] hotspot-to-wpa-cleanup: check for global config to be
 ready

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

diff --git a/hotspot-to-wpa-cleanup.capsman.rsc b/hotspot-to-wpa-cleanup.capsman.rsc
index fd0e5545..e4ac9678 100644
--- a/hotspot-to-wpa-cleanup.capsman.rsc
+++ b/hotspot-to-wpa-cleanup.capsman.rsc
@@ -14,9 +14,9 @@
 
 :local ExitOK false;
 :onerror Err {
-  :global GlobalFunctionsReady;
-  :retry { :if ($GlobalFunctionsReady != true) \
-      do={ :error ("Global functions not ready."); }; } delay=500ms max=50;
+  :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 EitherOr;
diff --git a/hotspot-to-wpa-cleanup.template.rsc b/hotspot-to-wpa-cleanup.template.rsc
index 11f359cc..d51e1d03 100644
--- a/hotspot-to-wpa-cleanup.template.rsc
+++ b/hotspot-to-wpa-cleanup.template.rsc
@@ -15,9 +15,9 @@
 
 :local ExitOK false;
 :onerror Err {
-  :global GlobalFunctionsReady;
-  :retry { :if ($GlobalFunctionsReady != true) \
-      do={ :error ("Global functions not ready."); }; } delay=500ms max=50;
+  :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 EitherOr;
diff --git a/hotspot-to-wpa-cleanup.wifi.rsc b/hotspot-to-wpa-cleanup.wifi.rsc
index 7f0ebae8..8bb2631b 100644
--- a/hotspot-to-wpa-cleanup.wifi.rsc
+++ b/hotspot-to-wpa-cleanup.wifi.rsc
@@ -14,9 +14,9 @@
 
 :local ExitOK false;
 :onerror Err {
-  :global GlobalFunctionsReady;
-  :retry { :if ($GlobalFunctionsReady != true) \
-      do={ :error ("Global functions not ready."); }; } delay=500ms max=50;
+  :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 EitherOr;

From a4f3eae0dd3c3b6dbb7b7ad40000f2feb9fed6e1 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Tue, 6 May 2025 14:08:37 +0200
Subject: [PATCH 111/129] hotspot-to-wpa: check for global config to be ready

---
 hotspot-to-wpa.capsman.rsc  | 6 +++---
 hotspot-to-wpa.template.rsc | 6 +++---
 hotspot-to-wpa.wifi.rsc     | 6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/hotspot-to-wpa.capsman.rsc b/hotspot-to-wpa.capsman.rsc
index a9a14075..8977cee1 100644
--- a/hotspot-to-wpa.capsman.rsc
+++ b/hotspot-to-wpa.capsman.rsc
@@ -13,9 +13,9 @@
 
 :local ExitOK false;
 :onerror Err {
-  :global GlobalFunctionsReady;
-  :retry { :if ($GlobalFunctionsReady != true) \
-      do={ :error ("Global functions not ready."); }; } delay=500ms max=50;
+  :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 EitherOr;
diff --git a/hotspot-to-wpa.template.rsc b/hotspot-to-wpa.template.rsc
index 84a43bcc..c5d977d1 100644
--- a/hotspot-to-wpa.template.rsc
+++ b/hotspot-to-wpa.template.rsc
@@ -14,9 +14,9 @@
 
 :local ExitOK false;
 :onerror Err {
-  :global GlobalFunctionsReady;
-  :retry { :if ($GlobalFunctionsReady != true) \
-      do={ :error ("Global functions not ready."); }; } delay=500ms max=50;
+  :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 EitherOr;
diff --git a/hotspot-to-wpa.wifi.rsc b/hotspot-to-wpa.wifi.rsc
index 5c5afdab..6a97e460 100644
--- a/hotspot-to-wpa.wifi.rsc
+++ b/hotspot-to-wpa.wifi.rsc
@@ -13,9 +13,9 @@
 
 :local ExitOK false;
 :onerror Err {
-  :global GlobalFunctionsReady;
-  :retry { :if ($GlobalFunctionsReady != true) \
-      do={ :error ("Global functions not ready."); }; } delay=500ms max=50;
+  :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 EitherOr;

From a93eeb74a299b8d2f21e82594fd719c43feeecdd Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Tue, 6 May 2025 14:08:37 +0200
Subject: [PATCH 112/129] ipsec-to-dns: check for global config to be ready

---
 ipsec-to-dns.rsc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ipsec-to-dns.rsc b/ipsec-to-dns.rsc
index fb7b55c1..1b5ed133 100644
--- a/ipsec-to-dns.rsc
+++ b/ipsec-to-dns.rsc
@@ -11,9 +11,9 @@
 
 :local ExitOK false;
 :onerror Err {
-  :global GlobalFunctionsReady;
-  :retry { :if ($GlobalFunctionsReady != true) \
-      do={ :error ("Global functions not ready."); }; } delay=500ms max=50;
+  :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 Domain;

From c972af67765512dfecc4f40c0c3dc26ab66485cc Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Tue, 6 May 2025 14:08:37 +0200
Subject: [PATCH 113/129] ipv6-update: check for global config to be ready

---
 ipv6-update.rsc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ipv6-update.rsc b/ipv6-update.rsc
index 24167c01..580a426c 100644
--- a/ipv6-update.rsc
+++ b/ipv6-update.rsc
@@ -10,9 +10,9 @@
 
 :local ExitOK false;
 :onerror Err {
-  :global GlobalFunctionsReady;
-  :retry { :if ($GlobalFunctionsReady != true) \
-      do={ :error ("Global functions not ready."); }; } delay=500ms max=50;
+  :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 LogPrint;

From d7c26ee6b099b7a1d66cbeb2ab6c597c0bc3d5c0 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Tue, 6 May 2025 14:08:37 +0200
Subject: [PATCH 114/129] lease-script: check for global config to be ready

---
 lease-script.rsc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lease-script.rsc b/lease-script.rsc
index 501e0470..b166ee3b 100644
--- a/lease-script.rsc
+++ b/lease-script.rsc
@@ -10,9 +10,9 @@
 
 :local ExitOK false;
 :onerror Err {
-  :global GlobalFunctionsReady;
-  :retry { :if ($GlobalFunctionsReady != true) \
-      do={ :error ("Global functions not ready."); }; } delay=500ms max=50;
+  :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 Grep;

From 2cded6536a5d2ecc49c4141d86ca0079a60569e2 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Tue, 6 May 2025 14:08:37 +0200
Subject: [PATCH 115/129] log-forward: check for global config to be ready

---
 log-forward.rsc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/log-forward.rsc b/log-forward.rsc
index 3774dac7..be7eff7b 100644
--- a/log-forward.rsc
+++ b/log-forward.rsc
@@ -10,9 +10,9 @@
 
 :local ExitOK false;
 :onerror Err {
-  :global GlobalFunctionsReady;
-  :retry { :if ($GlobalFunctionsReady != true) \
-      do={ :error ("Global functions not ready."); }; } delay=500ms max=50;
+  :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 Identity;

From bd501bcb7a1217b6145b046b178ce68c8cb03dd5 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Tue, 6 May 2025 14:08:37 +0200
Subject: [PATCH 116/129] mode-button: check for global config to be ready

---
 mode-button.rsc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/mode-button.rsc b/mode-button.rsc
index 6d8b7b3a..52789bf0 100644
--- a/mode-button.rsc
+++ b/mode-button.rsc
@@ -11,9 +11,9 @@
 
 :local ExitOK false;
 :onerror Err {
-  :global GlobalFunctionsReady;
-  :retry { :if ($GlobalFunctionsReady != true) \
-      do={ :error ("Global functions not ready."); }; } delay=500ms max=50;
+  :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 ModeButton;

From 81c5a5dfb014d484cd0d7f4ca0a215127b2c5437 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Tue, 6 May 2025 14:08:37 +0200
Subject: [PATCH 117/129] netwatch-dns: check for global config to be ready

---
 netwatch-dns.rsc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/netwatch-dns.rsc b/netwatch-dns.rsc
index 5a928f0a..3da14987 100644
--- a/netwatch-dns.rsc
+++ b/netwatch-dns.rsc
@@ -11,9 +11,9 @@
 
 :local ExitOK false;
 :onerror Err {
-  :global GlobalFunctionsReady;
-  :retry { :if ($GlobalFunctionsReady != true) \
-      do={ :error ("Global functions not ready."); }; } delay=500ms max=50;
+  :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 CertificateAvailable;

From 3b3976d836faf7032ec4f85a71952b8180c59561 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Tue, 6 May 2025 14:08:37 +0200
Subject: [PATCH 118/129] netwatch-notify: check for global config to be ready

---
 netwatch-notify.rsc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/netwatch-notify.rsc b/netwatch-notify.rsc
index 0c483305..fb8e8d5e 100644
--- a/netwatch-notify.rsc
+++ b/netwatch-notify.rsc
@@ -10,9 +10,9 @@
 
 :local ExitOK false;
 :onerror Err {
-  :global GlobalFunctionsReady;
-  :retry { :if ($GlobalFunctionsReady != true) \
-      do={ :error ("Global functions not ready."); }; } delay=500ms max=50;
+  :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 NetwatchNotify;

From 9dacda94cb4f8bffdc772e69da1a9a00f726cee6 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Tue, 6 May 2025 14:08:37 +0200
Subject: [PATCH 119/129] ospf-to-leds: check for global config to be ready

---
 ospf-to-leds.rsc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ospf-to-leds.rsc b/ospf-to-leds.rsc
index cdc06e55..26f8aa37 100644
--- a/ospf-to-leds.rsc
+++ b/ospf-to-leds.rsc
@@ -10,9 +10,9 @@
 
 :local ExitOK false;
 :onerror Err {
-  :global GlobalFunctionsReady;
-  :retry { :if ($GlobalFunctionsReady != true) \
-      do={ :error ("Global functions not ready."); }; } delay=500ms max=50;
+  :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 LogPrint;

From b7be20327bb83e4f15cab88d9025d3b08c562ef2 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Tue, 6 May 2025 14:08:37 +0200
Subject: [PATCH 120/129] packages-update: check for global config to be ready

---
 packages-update.rsc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages-update.rsc b/packages-update.rsc
index 81a6d132..4fde131b 100644
--- a/packages-update.rsc
+++ b/packages-update.rsc
@@ -11,9 +11,9 @@
 
 :local ExitOK false;
 :onerror Err {
-  :global GlobalFunctionsReady;
-  :retry { :if ($GlobalFunctionsReady != true) \
-      do={ :error ("Global functions not ready."); }; } delay=500ms max=50;
+  :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 BackupRandomDelay;

From 030befa2ccee1724691ffd769baf021cb6205f22 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Tue, 6 May 2025 14:08:37 +0200
Subject: [PATCH 121/129] ppp-on-up: check for global config to be ready

---
 ppp-on-up.rsc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ppp-on-up.rsc b/ppp-on-up.rsc
index ef08c9d8..f16d73f3 100644
--- a/ppp-on-up.rsc
+++ b/ppp-on-up.rsc
@@ -10,9 +10,9 @@
 
 :local ExitOK false;
 :onerror Err {
-  :global GlobalFunctionsReady;
-  :retry { :if ($GlobalFunctionsReady != true) \
-      do={ :error ("Global functions not ready."); }; } delay=500ms max=50;
+  :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 LogPrint;

From f3353edf107ca33b14e8854c3da0ffb3570624c4 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Tue, 6 May 2025 14:08:37 +0200
Subject: [PATCH 122/129] sms-action: check for global config to be ready

---
 sms-action.rsc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/sms-action.rsc b/sms-action.rsc
index 0f02bcec..47e19223 100644
--- a/sms-action.rsc
+++ b/sms-action.rsc
@@ -10,9 +10,9 @@
 
 :local ExitOK false;
 :onerror Err {
-  :global GlobalFunctionsReady;
-  :retry { :if ($GlobalFunctionsReady != true) \
-      do={ :error ("Global functions not ready."); }; } delay=500ms max=50;
+  :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;

From 2422da1e9688264171bd0895cdccf1b4339b5562 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Tue, 6 May 2025 14:08:37 +0200
Subject: [PATCH 123/129] sms-forward: check for global config to be ready

---
 sms-forward.rsc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/sms-forward.rsc b/sms-forward.rsc
index 9c3e4a55..8ca5ae43 100644
--- a/sms-forward.rsc
+++ b/sms-forward.rsc
@@ -11,9 +11,9 @@
 
 :local ExitOK false;
 :onerror Err {
-  :global GlobalFunctionsReady;
-  :retry { :if ($GlobalFunctionsReady != true) \
-      do={ :error ("Global functions not ready."); }; } delay=500ms max=50;
+  :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 Identity;

From f82cfeb28c1efb23d1c67da3780c71409cfd7701 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Tue, 6 May 2025 14:08:37 +0200
Subject: [PATCH 124/129] telegram-chat: check for global config to be ready

---
 telegram-chat.rsc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/telegram-chat.rsc b/telegram-chat.rsc
index f62034c1..b1f7f99e 100644
--- a/telegram-chat.rsc
+++ b/telegram-chat.rsc
@@ -11,9 +11,9 @@
 
 :local ExitOK false;
 :onerror Err {
-  :global GlobalFunctionsReady;
-  :retry { :if ($GlobalFunctionsReady != true) \
-      do={ :error ("Global functions not ready."); }; } delay=500ms max=50;
+  :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 Identity;

From c8c7e781ff2a2791f456f665d2b12cf47a7349a8 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Tue, 6 May 2025 14:08:37 +0200
Subject: [PATCH 125/129] update-gre-address: check for global config to be
 ready

---
 update-gre-address.rsc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/update-gre-address.rsc b/update-gre-address.rsc
index 8d98eaa7..dd7d63e4 100644
--- a/update-gre-address.rsc
+++ b/update-gre-address.rsc
@@ -11,9 +11,9 @@
 
 :local ExitOK false;
 :onerror Err {
-  :global GlobalFunctionsReady;
-  :retry { :if ($GlobalFunctionsReady != true) \
-      do={ :error ("Global functions not ready."); }; } delay=500ms max=50;
+  :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 CharacterReplace;

From 0d02af979864c60ad52f2d8e03984a11f63c3e6a Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Tue, 6 May 2025 14:08:37 +0200
Subject: [PATCH 126/129] update-tunnelbroker: check for global config to be
 ready

---
 update-tunnelbroker.rsc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/update-tunnelbroker.rsc b/update-tunnelbroker.rsc
index 2deb5b22..8e5e1d0f 100644
--- a/update-tunnelbroker.rsc
+++ b/update-tunnelbroker.rsc
@@ -13,9 +13,9 @@
 
 :local ExitOK false;
 :onerror Err {
-  :global GlobalFunctionsReady;
-  :retry { :if ($GlobalFunctionsReady != true) \
-      do={ :error ("Global functions not ready."); }; } delay=500ms max=50;
+  :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 CertificateAvailable;

From cadb54fd5e67e80c0ba158e88ab13c1c4d427ac0 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Tue, 6 May 2025 14:09:50 +0200
Subject: [PATCH 127/129] global-wait: check for global config to be ready

---
 global-wait.rsc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/global-wait.rsc b/global-wait.rsc
index ca3fc0c4..23b56298 100644
--- a/global-wait.rsc
+++ b/global-wait.rsc
@@ -8,5 +8,6 @@
 # wait for global-functions to finish
 # https://rsc.eworm.de/doc/global-wait.md
 
+:global GlobalConfigReady;
 :global GlobalFunctionsReady;
-:while ($GlobalFunctionsReady != true) do={ :delay 500ms; }
+:while ($GlobalConfigReady != true || $GlobalFunctionsReady != true) do={ :delay 500ms; }

From 80b1c8b5fb920af4965a4bbbf533e4e612e7be7f Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Tue, 6 May 2025 13:57:05 +0200
Subject: [PATCH 128/129] global-config: add another comment with visual hint

---
 global-config.rsc | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/global-config.rsc b/global-config.rsc
index c0577ff6..0d1bb5d8 100644
--- a/global-config.rsc
+++ b/global-config.rsc
@@ -9,6 +9,10 @@
 # Warning: Do *NOT* copy this line to overlay!
 :global GlobalConfigReady false;
 
+#   ||   ... but
+#  \||/   start
+#   \/    here!
+
 # Set this to 'true' to disable news and change notifications.
 :global NoNewsAndChangesNotification false;
 

From 7462b0b1f0c3ccc4e633d97b22178342ab73b409 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Tue, 6 May 2025 14:05:47 +0200
Subject: [PATCH 129/129] global-config: add another visual hint

---
 global-config.rsc | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/global-config.rsc b/global-config.rsc
index 0d1bb5d8..ab08fd02 100644
--- a/global-config.rsc
+++ b/global-config.rsc
@@ -272,7 +272,9 @@
 };
 
 # load custom settings from overlay and snippets
-# Warning: Do *NOT* copy this code to overlay!
+#   /\    Warning: Do *NOT*
+#  /\7\    copy this code
+# /_()_\     to overlay!
 :foreach Script in=([ /system/script/find where name="global-config-overlay" ], \
                     [ /system/script/find where name~"^global-config-overlay.d/" ]) do={
   :do {