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/179] 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/179] 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/179] 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/179] 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/179] 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/179] 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/179] 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/179] 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/179] 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/179] 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/179] 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/179] 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/179] 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/179] 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/179] 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/179] 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/179] 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/179] 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/179] 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/179] 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/179] 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/179] 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/179] 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/179] 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/179] 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/179] 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/179] 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/179] 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/179] 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 9acf9781cbe85c23b76bd82d1843b7fc9fa16913 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Tue, 6 May 2025 11:15:15 +0200
Subject: [PATCH 030/179] 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 7d4e4ec273342ce0738102ce123deb673b199d3f Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Tue, 6 May 2025 11:15:15 +0200
Subject: [PATCH 031/179] 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 64ec962bb6de5cef73a2c0da378f4e49a73e6e8e Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Tue, 6 May 2025 11:15:15 +0200
Subject: [PATCH 032/179] 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 bf1b3e3c5e7943309fbb1b036babd628b827dc63 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Tue, 6 May 2025 11:15:15 +0200
Subject: [PATCH 033/179] 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 9423d8019a5aa7a78f9fea16b228af112848f1f3 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Tue, 6 May 2025 11:15:15 +0200
Subject: [PATCH 034/179] 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 33393798b1a7eb5756b1da6b89d72daff05eea96 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Tue, 6 May 2025 11:15:15 +0200
Subject: [PATCH 035/179] 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 de5aab12ae2e3d8db965925941746d202813650a Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Tue, 6 May 2025 11:15:15 +0200
Subject: [PATCH 036/179] 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 b4188ab1a2356c0ce5f70f449a185900decc86ea Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Tue, 6 May 2025 11:15:15 +0200
Subject: [PATCH 037/179] 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 9b811e1ed25c9fc6c47eb4ef4d31036e3b7e3d0a Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Tue, 6 May 2025 11:15:15 +0200
Subject: [PATCH 038/179] 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 96cbb32a4f073e11f264e4a641cb304de49fb435 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Tue, 6 May 2025 11:15:15 +0200
Subject: [PATCH 039/179] 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 8f1ac6fa17afd96afb82de31f0e997b73f40d883 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Tue, 6 May 2025 11:15:15 +0200
Subject: [PATCH 040/179] 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 08d78224a000751409cd715c4219aae3e2ac9eba Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Tue, 6 May 2025 11:15:15 +0200
Subject: [PATCH 041/179] 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 69b2af4bd7ac5f63860532c36d762953adf87d90 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Tue, 6 May 2025 10:46:44 +0200
Subject: [PATCH 042/179] 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 2712bcb44db3e323faf2ddc18ddd228fcdbf215a Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Tue, 6 May 2025 11:15:15 +0200
Subject: [PATCH 043/179] 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 8418d58ff0703d18db0e513bd71484dc93c9e821 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Tue, 6 May 2025 11:15:15 +0200
Subject: [PATCH 044/179] 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 ff03f49724cdcba8774de481779b5f7e7993dc36 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Tue, 6 May 2025 09:44:23 +0200
Subject: [PATCH 045/179] mode-button: use :onerror for outer block

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

diff --git a/mode-button.rsc b/mode-button.rsc
index edc5f400..83897ba7 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;
@@ -26,7 +26,7 @@
 
   :if ([ :len $Scheduler ] = 0) do={
     $LogPrint info $ScriptName ("Creating scheduler _ModeButtonScheduler, counting presses...");
-    :global ModeButtonScheduler do={ :do {
+    :global ModeButtonScheduler do={ :onerror Err {
       :local FuncName $0;
 
       :global ModeButton;
@@ -82,8 +82,8 @@
       } else={
         $LogPrint info $FuncName ("No action defined for " . $Count . " mode-button presses.");
       }
-    } on-error={
-      :global ExitError; $ExitError false $0;
+    } do={
+      :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 a556f4c39858223e75e60228f9618aaaf0cc0af7 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Tue, 6 May 2025 11:15:15 +0200
Subject: [PATCH 046/179] 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 2d41ad718d785545c165ef4bcf4603abdbeec020 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Tue, 6 May 2025 09:44:23 +0200
Subject: [PATCH 047/179] 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 a308d4269e5d20f3787c524a427e8acf55e7a1d2 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Tue, 6 May 2025 11:15:15 +0200
Subject: [PATCH 048/179] 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 0df4170a2e634591327088988f685f0c35d82569 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Tue, 6 May 2025 09:44:23 +0200
Subject: [PATCH 049/179] 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 4d1349125da065caaa0f3a572629c875eeb01d96 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Tue, 6 May 2025 11:15:15 +0200
Subject: [PATCH 050/179] 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 c720eadd2c42286653ac8984d6e7c255b2ad97a8 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Tue, 6 May 2025 09:44:23 +0200
Subject: [PATCH 051/179] 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 4b92181f2eefcc416c3281fc376c42e33712eb55 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/179] 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 9a5a2aec4fc08685725e3d0ef2b98459cfd433e3 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Tue, 6 May 2025 09:44:23 +0200
Subject: [PATCH 053/179] 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 925e7f869e59b1c544062bdd6693f2a286a5504e 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/179] 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 aeccd36f16a13ebe01a48a9b522b503adf599c6e Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Tue, 6 May 2025 09:44:23 +0200
Subject: [PATCH 055/179] 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 76778f04319819eec8e2285f3a88703e4290cbde 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/179] 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 3eec13b8b58d57c04d957e13d016c9e587a5de68 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Tue, 6 May 2025 09:44:23 +0200
Subject: [PATCH 057/179] 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 057bbb8481f57cde2917aa358b36f6793f3bff85 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/179] 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 aae9b4d4e39c36ceeef1d0e1125c8bce9255bdac Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Tue, 6 May 2025 09:44:23 +0200
Subject: [PATCH 059/179] 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 bcdb74f31d9f4006ff55f83900a85e310f14c372 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Tue, 6 May 2025 13:52:57 +0200
Subject: [PATCH 060/179] 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 83cf003f62877f34abb112ed5105b391ea11f4e6 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/179] 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 3ad8cafc7a01ced329b4b1af6cafd87a282e71df Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Tue, 6 May 2025 09:44:23 +0200
Subject: [PATCH 062/179] 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 60c5e84401ddb1490bd43daf796e4ba86ca22327 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Tue, 6 May 2025 14:08:36 +0200
Subject: [PATCH 063/179] 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 41b705aa5a2158a7da7c51da4c95db96d7363d9c Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Tue, 6 May 2025 11:15:15 +0200
Subject: [PATCH 064/179] 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 fe3d9f841822d210d13af90025415015e89743a8 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Tue, 6 May 2025 09:44:23 +0200
Subject: [PATCH 065/179] 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 d57916fc267e9fdeb9c878f578c2b7d3736fbac6 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Tue, 6 May 2025 14:08:36 +0200
Subject: [PATCH 066/179] 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 829fce789b6d0bd5de192c8491e1b54a5fe9ba35 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/179] 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 d2af793683cdfa7e187da10cf8baf5c99e9c7fe1 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Tue, 6 May 2025 09:44:23 +0200
Subject: [PATCH 068/179] 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 37a6d4cc438b2b3481d8904aa0ec4dcde9a96ce8 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Tue, 6 May 2025 14:08:36 +0200
Subject: [PATCH 069/179] 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 a6ab95ccef4bc3255b7d45f66f86865337459f67 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/179] 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 02986eb77a2f6e2b8a0f008ca21ed49dd6195e24 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Tue, 6 May 2025 09:45:14 +0200
Subject: [PATCH 071/179] 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 200167fa38037a02d63c249639027614f101118f Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Tue, 6 May 2025 14:08:36 +0200
Subject: [PATCH 072/179] 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 63606ad25cec7d1345c3b3a9158472328f02444c 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/179] 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 83897ba7..e5c836f0 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 d5141f43e5e812e387eadb7b6f505f136032c48f Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Tue, 6 May 2025 09:45:14 +0200
Subject: [PATCH 074/179] 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 27fc07e9406ae6a37f642213d5da3d23b92e63f2 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Tue, 6 May 2025 14:08:36 +0200
Subject: [PATCH 075/179] 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 2374be9a2192a1bcf43aa487facc1c17da34e08d 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/179] 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 9b558ff8a1bc57f3197e71d73b468e820577d4f7 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Tue, 6 May 2025 09:45:14 +0200
Subject: [PATCH 077/179] 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 12037ff6e618d84bead0252d9fee36617e9e7ee6 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Tue, 6 May 2025 14:08:36 +0200
Subject: [PATCH 078/179] 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 446aa3d7ffff5f9b70be2bfafdcef2ec88f3742c 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/179] 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 8cddc63767010072417d405cc4460febb8e9978d Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Tue, 6 May 2025 09:45:14 +0200
Subject: [PATCH 080/179] 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 40b19a179d0b7b87cfc2bf2fd9a92c0a20f95532 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Tue, 6 May 2025 14:08:36 +0200
Subject: [PATCH 081/179] 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 ff812dd1928657dbae9df59e2d19d6f6fe33fb1f 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/179] 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 862830b341716250daba288091b36d64926dccdb Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Tue, 6 May 2025 09:45:14 +0200
Subject: [PATCH 083/179] 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 ef1a402c4e61be10824ef441811d6f8a03ed35a7 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Tue, 6 May 2025 14:08:37 +0200
Subject: [PATCH 084/179] 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 4358dabb19d45e3bee816d6f9bc76dad21a3c10c 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/179] 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 9d845d40f00250e1b3107c175aa2f1a77ffb3a63 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Tue, 6 May 2025 09:45:14 +0200
Subject: [PATCH 086/179] 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 4954a886958a7e3e0b9c05dcd9e8d4135f0d5a04 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Tue, 6 May 2025 14:08:37 +0200
Subject: [PATCH 087/179] 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 7b624faaa108201522cb792fcf776c39e30a0839 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/179] 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 d865deb8a8710d98453adf221e72fdfd0a71dc33 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Tue, 6 May 2025 09:45:14 +0200
Subject: [PATCH 089/179] 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 1936dcb563c47b4ca4847912077f5f609d1360ad Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Tue, 6 May 2025 14:08:37 +0200
Subject: [PATCH 090/179] 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 0ef8888412f2f9ad8fe8ffc714b3dfb30802f55e Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Tue, 6 May 2025 11:15:15 +0200
Subject: [PATCH 091/179] 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 e3a15cc6b803453290d2cc8e2415c207473aa2a1 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Tue, 6 May 2025 09:45:14 +0200
Subject: [PATCH 092/179] 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 506acb748b9e6670323b68fb46b90e5d16ddff15 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Tue, 6 May 2025 14:08:37 +0200
Subject: [PATCH 093/179] 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 24ea16cf91dae10a654e77911dbb53b213a6fd4f Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Tue, 6 May 2025 11:15:15 +0200
Subject: [PATCH 094/179] 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 f7ba78702f92bec374b59066e57772d76f97358f Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Tue, 6 May 2025 09:45:14 +0200
Subject: [PATCH 095/179] 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 78463f469b02768c1197db9c2cc35c46581c7fcc Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Tue, 6 May 2025 14:08:37 +0200
Subject: [PATCH 096/179] 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 35bce7c5eb775e7d9d0e774344918383d17b9009 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Tue, 6 May 2025 11:15:15 +0200
Subject: [PATCH 097/179] 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 5958851bd7e3b034dda25f670e0019247c4d73a0 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Tue, 6 May 2025 09:45:14 +0200
Subject: [PATCH 098/179] 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 59c66de69065989d8f3b6032c156d484299f2032 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/179] 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 87edd0bd29f3825fd638760f20343f5afe890ae3 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Tue, 6 May 2025 11:15:15 +0200
Subject: [PATCH 100/179] 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 af40ae82edaccbf6d1995f8ad1a5250f57f950db Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Tue, 6 May 2025 09:45:14 +0200
Subject: [PATCH 101/179] 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 286ed96cc34efa929093bb72e64d102b458ae60e 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/179] 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 6040f70b19a06dc0d9817f3240b1bb13c34d453c Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Tue, 6 May 2025 11:15:15 +0200
Subject: [PATCH 103/179] 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 b19c448f7839aea73830fb0f3bb7314f98ce2f2c 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/179] 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 ad6ad5bfccfec0bfbb83848ddf6784ef12e1e770 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/179] 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 857993cf90b0bb432c18292816734f55ed2867cf 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/179] 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 a68763c4dd4ca4e93dcd0edd98cd25bc8ac5d734 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/179] 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 9e70bca30b792785034422db15bf158d94e666e6 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/179] 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 148892694fe43d6382ec368e450634342965882a 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/179] 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 713e63da87d57d77961ddf606b4438a4c2b7ecd7 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/179] 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 6a9fced721e9ed54b451aeecc2e68f761663dfb6 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/179] 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 ce29fcf49ed381ebd910f74193ce3be7cac1def9 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/179] 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 59f9a1187f769dc57d778a77264ae69591ac594b 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/179] 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 10bd9a1cb5b3d556abcc5732d894e3bcc797e94b 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/179] 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 160effd91b66459dd9a2ecaf5ecc442a33f135c5 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/179] 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 bc1c238158a18f5fc7122a5110f21d29e72540cb 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/179] 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 e5c836f0..c6422f0b 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 2d39dbdf7c363ba5657dee6c94f9763bbaab3e86 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/179] 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 5b40380cd2dfe6b3fcd0828460851c41e1d1b416 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/179] 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 aaecd1b457f5e5779276c7217d1c5429536d5534 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/179] 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 38ec392a5fd462a803f4e04219a0d4acbf98bc63 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/179] 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 194698f53f27bebc9ee349597c764b58cd4475b0 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/179] 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 6270ac45d8ed241cfe31e345cccc097cb33bd02b 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/179] 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 15248ffd39b982a176d87c39db6c3f789102a29f 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/179] 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 9b5419b939cadc751076c68a2b6bb8434a828444 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/179] 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 b4d80d3b178e376568a3e7bbcb5dce29c631e383 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/179] 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 f2dbb9eff34aa43fd2be41f9a6a36da06e07dbb0 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/179] 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 0f58cecc0f2f114d5520db5d283fcd7d243c1bc1 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/179] 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 4561b17dbff272b1b5671155ee1838dba2f24062 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/179] global-config: add another comment with visual hint

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

diff --git a/global-config.rsc b/global-config.rsc
index c0577ff6..2d7d43d2 100644
--- a/global-config.rsc
+++ b/global-config.rsc
@@ -8,6 +8,9 @@
 
 # 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 661aad522b09bf4aba5b0be4877669e0a826b4a6 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/179] global-config: add another visual hint

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

diff --git a/global-config.rsc b/global-config.rsc
index 2d7d43d2..589a58a4 100644
--- a/global-config.rsc
+++ b/global-config.rsc
@@ -270,8 +270,11 @@
   "cert2-cn"="4n0th3r-s3cr3t";
 };
 
+#    /\       Warning: Do *NOT* copy
+#   /\7\    the code below to overlay!
+#  /_()_\      Things *will* break!
+#
 # load custom settings from overlay and snippets
-# Warning: Do *NOT* 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 {

From f095b581e74b5c5a8110c801243b2ec039499120 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Tue, 6 May 2025 19:42:12 +0200
Subject: [PATCH 130/179] global-functions: $ScriptInstallUpdate: set config
 and functions not ready...

... before reload. This should fix some corner cases where scripts ran
with broken configuration or functions.

Also do reload both - configuration and functions - to simplify the
function.
---
 global-functions.rsc | 37 ++++++++++++++++---------------------
 1 file changed, 16 insertions(+), 21 deletions(-)

diff --git a/global-functions.rsc b/global-functions.rsc
index 29e6d06b..6e3d7120 100644
--- a/global-functions.rsc
+++ b/global-functions.rsc
@@ -1126,6 +1126,8 @@
   :global CommitId;
   :global CommitInfo;
   :global ExpectedConfigVersion;
+  :global GlobalConfigReady;
+  :global GlobalFunctionsReady;
   :global Identity;
   :global IDonate;
   :global NoNewsAndChangesNotification;
@@ -1159,8 +1161,7 @@
 
   :local CommitIdBefore $CommitId;
   :local ExpectedConfigVersionBefore $ExpectedConfigVersion;
-  :local ReloadGlobalFunctions false;
-  :local ReloadGlobalConfig false;
+  :local ReloadGlobal false;
   :local DeviceMode [ /system/device-mode/get ];
 
   :local CheckSums ({});
@@ -1269,31 +1270,25 @@
       $LogPrint info $0 ("Updating script: " . $ScriptVal->"name");
       /system/script/set owner=($ScriptVal->"name") \
           source=[ $IfThenElse ($ScriptUpdatesCRLF = true) $SourceCRLF $SourceNew ] $Script;
-      :if ($ScriptVal->"name" = "global-config") do={
-        :set ReloadGlobalConfig true;
-      }
-      :if ($ScriptVal->"name" = "global-functions" || $ScriptVal->"name" ~ ("^mod/.")) do={
-        :set ReloadGlobalFunctions true;
+      :if ($ScriptVal->"name" = "global-config" || \
+           $ScriptVal->"name" = "global-functions" || \
+           $ScriptVal->"name" ~ ("^mod/.")) do={
+        :set ReloadGlobal true;
       }
     } on-error={ }
   }
 
-  :if ($ReloadGlobalFunctions = true) do={
-    $LogPrint info $0 ("Reloading global functions.");
-    :do {
-      /system/script/run global-functions;
-    } on-error={
-      $LogPrint error $0 ("Reloading global functions failed!");
-    }
-  }
+  :if ($ReloadGlobal = true) do={
+    $LogPrint info $0 ("Reloading global configuration and functions.");
+    :set GlobalConfigReady false;
+    :set GlobalFunctionsReady false;
+    :delay 1s;
 
-  :if ($ReloadGlobalConfig = true) do={
-    $LogPrint info $0 ("Reloading global configuration.");
-    :do {
+    :onerror Err {
       /system/script/run global-config;
-    } on-error={
-      $LogPrint error $0 ("Reloading global configuration failed!" . \
-        " Syntax error or missing overlay?");
+      /system/script/run global-functions;
+    } do={
+      $LogPrint error $0 ("Reloading global configuration and functions failed! " . $Err);
     }
   }
 

From 90857805622a97ac3b150da60579952bf2ba0185 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Wed, 7 May 2025 11:45:55 +0200
Subject: [PATCH 131/179] sms-forward: delay after removal...

... to give the SIM card some time to succeed. Removing several messages
one after another fails without this.
---
 sms-forward.rsc | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/sms-forward.rsc b/sms-forward.rsc
index 8ca5ae43..4798a8ac 100644
--- a/sms-forward.rsc
+++ b/sms-forward.rsc
@@ -62,6 +62,7 @@
           ($SmsVal->"message")~("^:cmd " . $Settings->"secret" . " script ")) do={
         $LogPrint debug $ScriptName ("Removing SMS, which started a script.");
         /tool/sms/inbox/remove $Sms;
+        :delay 50ms;
       } else={
         :set Messages ($Messages . "\n\nOn " . $SmsVal->"timestamp" . \
             " type " . $SmsVal->"type" . ":\n" . $SmsVal->"message");
@@ -93,6 +94,7 @@
           " by " . $Identity . " from " . $Phone . ":" . $Messages) });
       :foreach Sms in=$Delete do={
         /tool/sms/inbox/remove $Sms;
+        :delay 50ms;
       }
     }
   }

From 01f3cb91e796fba77bc7ec810d98a31fe2a33843 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Wed, 7 May 2025 14:31:37 +0200
Subject: [PATCH 132/179] sms-forward: add error handling on message removal

---
 sms-forward.rsc | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/sms-forward.rsc b/sms-forward.rsc
index 4798a8ac..a564056a 100644
--- a/sms-forward.rsc
+++ b/sms-forward.rsc
@@ -61,8 +61,12 @@
       :if ($Phone = $Settings->"allowed-number" && \
           ($SmsVal->"message")~("^:cmd " . $Settings->"secret" . " script ")) do={
         $LogPrint debug $ScriptName ("Removing SMS, which started a script.");
-        /tool/sms/inbox/remove $Sms;
-        :delay 50ms;
+        :onerror Err {
+          /tool/sms/inbox/remove $Sms;
+          :delay 50ms;
+        } do={
+          $LogPrint warning $ScriptName ("Failed to remove message: " . $Err);
+        }
       } else={
         :set Messages ($Messages . "\n\nOn " . $SmsVal->"timestamp" . \
             " type " . $SmsVal->"type" . ":\n" . $SmsVal->"message");
@@ -93,8 +97,12 @@
         message=("Received " . [ $IfThenElse ($Count = 1) "this message" ("these " . $Count . " messages") ] . \
           " by " . $Identity . " from " . $Phone . ":" . $Messages) });
       :foreach Sms in=$Delete do={
-        /tool/sms/inbox/remove $Sms;
-        :delay 50ms;
+        :onerror Err {
+          /tool/sms/inbox/remove $Sms;
+          :delay 50ms;
+        } do={
+          $LogPrint warning $ScriptName ("Failed to remove message: " . $Err);
+        }
       }
     }
   }

From 6691e2e765c7dbfa3e639bea2331bbbf0b83ed4f Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Wed, 21 May 2025 21:51:16 +0200
Subject: [PATCH 133/179] global-functions: $DownloadPackage: reverse failure
 logic...

... and do not retry.
---
 global-functions.rsc | 29 +++++++++++++----------------
 1 file changed, 13 insertions(+), 16 deletions(-)

diff --git a/global-functions.rsc b/global-functions.rsc
index 6e3d7120..1dd77083 100644
--- a/global-functions.rsc
+++ b/global-functions.rsc
@@ -391,25 +391,22 @@
   :local Url ("https://upgrade.mikrotik.com/routeros/" . $PkgVer . "/" . $PkgFile);
   $LogPrint info $0 ("Downloading package file '" . $PkgName . "'...");
   $LogPrint debug $0 ("... from url: " . $Url);
-  :local Retry 3;
-  :while ($Retry > 0) do={
-    :do {
-      /tool/fetch check-certificate=yes-without-crl $Url dst-path=$PkgDest;
-      $WaitForFile $PkgDest;
 
-      :if ([ /file/get [ find where name=$PkgDest ] type ] = "package") do={
-        :return true;
-      }
-    } on-error={
-      $LogPrint debug $0 ("Downloading package file failed.");
-    }
-
-    $RmFile $PkgDest;
-    :set Retry ($Retry - 1);
+  :do {
+    /tool/fetch check-certificate=yes-without-crl $Url dst-path=$PkgDest;
+    $WaitForFile $PkgDest;
+  } on-error={
+    $LogPrint warning $0 ("Downloading package file '" . $PkgName . "' failed.");
+    :return false;
   }
 
-  $LogPrint warning $0 ("Downloading package file '" . $PkgName . "' failed.");
-  :return false;
+  :if ([ /file/get [ find where name=$PkgDest ] type ] != "package") do={
+    $LogPrint warning $0 ("Downloaded file is not a package, removing.");
+    $RmFile $PkgDest;
+    :return false;
+  }
+
+  :return true;
 }
 
 # return either first (if "true") or second

From c3fce370660b8c128f579d2a419c657395748c2e Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Wed, 7 May 2025 17:59:20 +0200
Subject: [PATCH 134/179] backup-partition: :do ... on-error=... -> :onerror
 ... do=...

---
 backup-partition.rsc | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/backup-partition.rsc b/backup-partition.rsc
index c2221d2c..ae7ad030 100644
--- a/backup-partition.rsc
+++ b/backup-partition.rsc
@@ -32,14 +32,15 @@
 
     :global LogPrint;
 
-    :do {
+    :onerror Err {
       /partitions/copy-to $FallbackTo;
       $LogPrint info $ScriptName ("Copied RouterOS to partition '" . $FallbackToName . "'.");
-      :return true;
-    } on-error={
-      $LogPrint error $ScriptName ("Failed copying RouterOS to partition '" . $FallbackToName . "'!");
+    } do={
+      $LogPrint error $ScriptName ("Failed copying RouterOS to partition '" . \
+          $FallbackToName . "': " . $Err);
       :return false;
     }
+    :return true;
   }
 
   :if ([ $ScriptLock $ScriptName ] = false) do={
@@ -107,16 +108,17 @@
     }
   }
 
-  :do {
+  :onerror Err {
     /system/scheduler/add start-time=startup name="running-from-backup-partition" \
         on-event=(":log warning (\"Running from partition '\" . " . \
         "[ /partitions/get [ find where running ] name ] . \"'!\")");
     /partitions/save-config-to $FallbackTo;
     /system/scheduler/remove "running-from-backup-partition";
     $LogPrint info $ScriptName ("Saved configuration to partition '" . $FallbackToName . "'.");
-  } on-error={
+  } do={
     /system/scheduler/remove [ find where name="running-from-backup-partition" ];
-    $LogPrint error $ScriptName ("Failed saving configuration to partition '" . $FallbackToName . "'!");
+    $LogPrint error $ScriptName ("Failed saving configuration to partition '" . \
+        $FallbackToName . "': " . $Err);
     :set PackagesUpdateBackupFailure true;
     :set ExitOK true;
     :error false;

From dc2296d5004b806aa5c5812c0e1a7ff4016be005 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Wed, 7 May 2025 18:03:30 +0200
Subject: [PATCH 135/179] backup-upload: :do ... on-error=... -> :onerror ...
 do=...

---
 backup-upload.rsc | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/backup-upload.rsc b/backup-upload.rsc
index 11ced4ca..e6b9f92f 100644
--- a/backup-upload.rsc
+++ b/backup-upload.rsc
@@ -90,13 +90,13 @@
     /system/backup/save encryption=aes-sha256 name=$FilePath password=$BackupPassword;
     $WaitForFile ($FilePath . ".backup");
 
-    :do {
+    :onerror Err {
       /tool/fetch upload=yes url=($BackupUploadUrl . "/" . $FileName . ".backup") \
           user=$BackupUploadUser password=$BackupUploadPass src-path=($FilePath . ".backup");
       :set BackupFile [ /file/get ($FilePath . ".backup") ];
       :set ($BackupFile->"name") ($FileName . ".backup");
-    } on-error={
-      $LogPrint error $ScriptName ("Uploading backup file failed!");
+    } do={
+      $LogPrint error $ScriptName ("Uploading backup file failed: " . $Err);
       :set BackupFile "failed";
       :set Failed 1;
     }
@@ -109,13 +109,13 @@
     /export terse show-sensitive file=$FilePath;
     $WaitForFile ($FilePath . ".rsc");
 
-    :do {
+    :onerror Err {
       /tool/fetch upload=yes url=($BackupUploadUrl . "/" . $FileName . ".rsc") \
           user=$BackupUploadUser password=$BackupUploadPass src-path=($FilePath . ".rsc");
       :set ExportFile [ /file/get ($FilePath . ".rsc") ];
       :set ($ExportFile->"name") ($FileName . ".rsc");
-    } on-error={
-      $LogPrint error $ScriptName ("Uploading configuration export failed!");
+    } do={
+      $LogPrint error $ScriptName ("Uploading configuration export failed: " . $Err);
       :set ExportFile "failed";
       :set Failed 1;
     }
@@ -130,13 +130,13 @@
         file=($FilePath . ".conf\00");
     $WaitForFile ($FilePath . ".conf");
 
-    :do {
+    :onerror Err {
       /tool/fetch upload=yes url=($BackupUploadUrl . "/" . $FileName . ".conf") \
           user=$BackupUploadUser password=$BackupUploadPass src-path=($FilePath . ".conf");
       :set ConfigFile [ /file/get ($FilePath . ".conf") ];
       :set ($ConfigFile->"name") ($FileName . ".conf");
-    } on-error={
-      $LogPrint error $ScriptName ("Uploading global-config-overlay failed!");
+    } do={
+      $LogPrint error $ScriptName ("Uploading global-config-overlay failed: " . $Err);
       :set ConfigFile "failed";
       :set Failed 1;
     }

From 187aeba78bebef1d1f47524c690ad260adffcadd Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Thu, 8 May 2025 09:04:15 +0200
Subject: [PATCH 136/179] check-health: :do ... on-error=... -> :onerror ...
 do=...

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

diff --git a/check-health.rsc b/check-health.rsc
index 1b92d1e4..4cb99408 100644
--- a/check-health.rsc
+++ b/check-health.rsc
@@ -89,10 +89,10 @@
   :foreach Plugin in=$Plugins do={
     :local PluginVal [ /system/script/get $Plugin ];
     :if ([ $ValidateSyntax ($PluginVal->"source") ] = true) do={
-      :do {
+      :onerror Err {
         /system/script/run $Plugin;
-      } on-error={
-        $LogPrint error $ScriptName ("Plugin '" . $ScriptVal->"name" . "' failed to run.");
+      } do={
+        $LogPrint error $ScriptName ("Plugin '" . $ScriptVal->"name" . "' failed to run: " . $Err);
       }
     } else={
       $LogPrint error $ScriptName ("Plugin '" . $ScriptVal->"name" . "' failed syntax validation, skipping.");

From 1925d2847c6d9b48364e24153fcbfb10cd9e758d Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Thu, 8 May 2025 09:05:41 +0200
Subject: [PATCH 137/179] check-lte-firmware-upgrade: :do ... on-error=... ->
 :onerror ... do=...

---
 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 1a5e08ce..9f4b6562 100644
--- a/check-lte-firmware-upgrade.rsc
+++ b/check-lte-firmware-upgrade.rsc
@@ -45,12 +45,12 @@
     :local IntName [ /interface/lte/get $Interface name ];
     :local Firmware;
     :local Info;
-    :do {
+    :onerror Err {
       :set Firmware [ /interface/lte/firmware-upgrade $Interface as-value ];
       :set Info [ /interface/lte/monitor $Interface once as-value ];
-    } on-error={
+    } do={
       $LogPrint debug $ScriptName ("Could not get latest LTE firmware version for interface " . \
-        $IntName . ".");
+        $IntName . ": " . $Err);
       :return false;
     }
 

From 79f681b80115b2f663feda478294717bb021c7ba Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Thu, 8 May 2025 09:06:25 +0200
Subject: [PATCH 138/179] check-routeros-update: :do ... on-error=... ->
 :onerror ... do=...

---
 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 34d06475..e28a0190 100644
--- a/check-routeros-update.rsc
+++ b/check-routeros-update.rsc
@@ -141,13 +141,13 @@
 
     :if ([ :len $SafeUpdateUrl ] > 0) do={
       :local Result;
-      :do {
+      :onerror Err {
         :set Result [ /tool/fetch check-certificate=yes-without-crl \
             ($SafeUpdateUrl . $Update->"channel" . "?installed=" . $Update->"installed-version" . \
             "&latest=" . $Update->"latest-version") http-header-field=({ [ $FetchUserAgentStr $ScriptName ] }) \
             output=user as-value ];
-      } on-error={
-        $LogPrint warning $ScriptName ("Failed receiving safe version for " . $Update->"channel" . ".");
+      } do={
+        $LogPrint warning $ScriptName ("Failed receiving safe version for " . $Update->"channel" . ": " . $Err);
       }
       :if ($Result->"status" = "finished" && $Result->"data" = $Update->"latest-version") do={
         $LogPrint info $ScriptName ("Version " . $Update->"latest-version" . " is considered safe, updating...");

From 142b0760b0e8daa205cc1fc8f471716e219ece82 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Thu, 8 May 2025 09:17:46 +0200
Subject: [PATCH 139/179] fw-addr-lists: :do ... on-error=... -> :onerror ...
 do=...

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

diff --git a/fw-addr-lists.rsc b/fw-addr-lists.rsc
index 4ee3c344..659fb2f9 100644
--- a/fw-addr-lists.rsc
+++ b/fw-addr-lists.rsc
@@ -176,13 +176,13 @@
       :foreach Address,Timeout in=$Branch do={
         $LogPrintVerbose debug $ScriptName ("Adding IPv4 address to list '" . $FwListName . \
             "' with " . $Timeout . ": " . $Address);
-        :do {
+        :onerror Err {
           /ip/firewall/address-list/add list=$FwListName comment=$ListComment \
               address=$Address timeout=$Timeout;
           :set CntAdd ($CntAdd + 1);
-        } on-error={
-          $LogPrint warning $ScriptName ("Failed to add IPv4 address to list '" . $FwListName . \
-              "': " . $Address);
+        } do={
+          $LogPrint warning $ScriptName ("Failed to add IPv4 address " . $Address . \
+              " to list '" . $FwListName . "': " . $Err);
         }
       }
     }
@@ -192,13 +192,13 @@
       :foreach Address,Timeout in=$Branch do={
         $LogPrintVerbose debug $ScriptName ("Adding IPv6 address to list '" . $FwListName . \
             "' with " . $Timeout . ": " . $Address);
-        :do {
+        :onerror Err {
           /ipv6/firewall/address-list/add list=$FwListName comment=$ListComment \
               address=$Address timeout=$Timeout;
           :set CntAdd ($CntAdd + 1);
-        } on-error={
-          $LogPrint warning $ScriptName ("Failed to add IPv6 address to list '" . $FwListName . \
-              "': " . $Address);
+        } do={
+          $LogPrint warning $ScriptName ("Failed to add IPv6 address " . $Address . \
+              " to list '" . $FwListName . "': " . $Err);
         }
       }
     }

From b807fc9e90b105c2057631c23f5685d18b811951 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Thu, 8 May 2025 09:21:03 +0200
Subject: [PATCH 140/179] fw-addr-lists: adopt changes in wording...

... to match the changes from previous commit.
---
 fw-addr-lists.rsc | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/fw-addr-lists.rsc b/fw-addr-lists.rsc
index 659fb2f9..5a03875d 100644
--- a/fw-addr-lists.rsc
+++ b/fw-addr-lists.rsc
@@ -135,15 +135,15 @@
       :local Branch [ $GetBranch $Address ];
       :local TimeOut ($IPv4Addresses->$Branch->$Address);
       :if ([ :typeof $TimeOut ] = "time") do={
-        $LogPrintVerbose debug $ScriptName ("Renewing IPv4 address in list '" . $FwListName . \
-            "' with " . $TimeOut . ": " . $Address);
+        $LogPrintVerbose debug $ScriptName ("Renewing IPv4 address " . $Address . \
+            " in list '" . $FwListName . "' with " . $TimeOut . ".");
         /ip/firewall/address-list/set $Entry timeout=$TimeOut;
         :set ($IPv4Addresses->$Branch->$Address);
         :set CntRenew ($CntRenew + 1);
       } else={
         :if ($Failure = false) do={
-          $LogPrintVerbose debug $ScriptName ("Removing IPv4 address from list '" . $FwListName . \
-              "': " . $Address);
+          $LogPrintVerbose debug $ScriptName ("Removing IPv4 address " . $Address . \
+              " from list '" . $FwListName . ".");
           /ip/firewall/address-list/remove $Entry;
           :set CntRemove ($CntRemove + 1);
         }
@@ -156,15 +156,15 @@
       :local Branch [ $GetBranch $Address ];
       :local TimeOut ($IPv6Addresses->$Branch->$Address);
       :if ([ :typeof $TimeOut ] = "time") do={
-        $LogPrintVerbose debug $ScriptName ("Renewing IPv6 address in list '" . $FwListName . \
-            "' with " . $TimeOut . ": " . $Address);
+        $LogPrintVerbose debug $ScriptName ("Renewing IPv6 address " . $Address . \
+            " in list '" . $FwListName . "' with " . $TimeOut . ".");
         /ipv6/firewall/address-list/set $Entry timeout=$TimeOut;
         :set ($IPv6Addresses->$Branch->$Address);
         :set CntRenew ($CntRenew + 1);
       } else={
         :if ($Failure = false) do={
-          $LogPrintVerbose debug $ScriptName ("Removing IPv6 address from list '" . $FwListName . \
-              "': " . $Address);
+          $LogPrintVerbose debug $ScriptName ("Removing IPv6 address " . $Address . \
+              " from list '" . $FwListName .".");
           /ipv6/firewall/address-list/remove $Entry;
           :set CntRemove ($CntRemove + 1);
         }
@@ -174,8 +174,8 @@
     :foreach BranchName,Branch in=$IPv4Addresses do={
       $LogPrintVerbose debug $ScriptName ("Handling branch: " . $BranchName);
       :foreach Address,Timeout in=$Branch do={
-        $LogPrintVerbose debug $ScriptName ("Adding IPv4 address to list '" . $FwListName . \
-            "' with " . $Timeout . ": " . $Address);
+        $LogPrintVerbose debug $ScriptName ("Adding IPv4 address " . $Address . \
+            " to list '" . $FwListName . "' with " . $Timeout . ".");
         :onerror Err {
           /ip/firewall/address-list/add list=$FwListName comment=$ListComment \
               address=$Address timeout=$Timeout;
@@ -190,8 +190,8 @@
     :foreach BranchName,Branch in=$IPv6Addresses do={
       $LogPrintVerbose debug $ScriptName ("Handling branch: " . $BranchName);
       :foreach Address,Timeout in=$Branch do={
-        $LogPrintVerbose debug $ScriptName ("Adding IPv6 address to list '" . $FwListName . \
-            "' with " . $Timeout . ": " . $Address);
+        $LogPrintVerbose debug $ScriptName ("Adding IPv6 address " . $Address . \
+            " to list '" . $FwListName . "' with " . $Timeout . ".");
         :onerror Err {
           /ipv6/firewall/address-list/add list=$FwListName comment=$ListComment \
               address=$Address timeout=$Timeout;

From a9e7bb0a05c4b4a2744039ce7369760c5cbc0c9f Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Thu, 8 May 2025 09:22:02 +0200
Subject: [PATCH 141/179] global-config: :do ... on-error=... -> :onerror ...
 do=...

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

diff --git a/global-config.rsc b/global-config.rsc
index 589a58a4..86d528aa 100644
--- a/global-config.rsc
+++ b/global-config.rsc
@@ -277,11 +277,11 @@
 # load custom settings from overlay and snippets
 :foreach Script in=([ /system/script/find where name="global-config-overlay" ], \
                     [ /system/script/find where name~"^global-config-overlay.d/" ]) do={
-  :do {
+  :onerror Err {
     /system/script/run $Script;
-  } on-error={
+  } do={
     :log error ("Loading configuration from overlay or snippet " . \
-        [ /system/script/get $Script name ] . " failed!");
+        [ /system/script/get $Script name ] . " failed: " . $Err);
   }
 }
 

From 5b89f3e425c0703c804dda76ef22efe22b438cc3 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Wed, 21 May 2025 21:53:34 +0200
Subject: [PATCH 142/179] global-functions: $DownloadPackage: :do ...
 on-error=... -> :onerror ... do=...

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

diff --git a/global-functions.rsc b/global-functions.rsc
index 1dd77083..fc33f5aa 100644
--- a/global-functions.rsc
+++ b/global-functions.rsc
@@ -392,11 +392,11 @@
   $LogPrint info $0 ("Downloading package file '" . $PkgName . "'...");
   $LogPrint debug $0 ("... from url: " . $Url);
 
-  :do {
+  :onerror Err {
     /tool/fetch check-certificate=yes-without-crl $Url dst-path=$PkgDest;
     $WaitForFile $PkgDest;
-  } on-error={
-    $LogPrint warning $0 ("Downloading package file '" . $PkgName . "' failed.");
+  } do={
+    $LogPrint warning $0 ("Downloading package file '" . $PkgName . "' failed: " . $Err);
     :return false;
   }
 

From a6b36dde7bbd9bd4308588cbe0b10ae04399b8e6 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Thu, 8 May 2025 09:24:56 +0200
Subject: [PATCH 143/179] global-functions: $FetchHuge: :do ... on-error=... ->
 :onerror ... do=...

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

diff --git a/global-functions.rsc b/global-functions.rsc
index fc33f5aa..3b7ff7cf 100644
--- a/global-functions.rsc
+++ b/global-functions.rsc
@@ -486,14 +486,14 @@
   }
 
   :local FileName ($DirName . "/" . [ $CleanName $0 ] . "-" . [ $GetRandom20CharAlNum ]);
-  :do {
+  :onerror Err {
     /tool/fetch check-certificate=$CheckCert $Url dst-path=$FileName \
       http-header-field=({ [ $FetchUserAgentStr $ScriptName ] }) as-value;
-  } on-error={
+  } do={
     :if ([ $WaitForFile $FileName 500ms ] = true) do={
       $RmFile $FileName;
     }
-    $LogPrint debug $0 ("Failed downloading from: " . $Url);
+    $LogPrint debug $0 ("Failed downloading from " . $Url . " - " . $Err);
     $RmDir $DirName;
     :return false;
   }

From 7a1fef78a26bfa913c4aaa5702b2d4178e663118 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Thu, 8 May 2025 09:26:53 +0200
Subject: [PATCH 144/179] global-functions: $GetMacVendor: :do ... on-error=...
 -> :onerror ... do=...

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

diff --git a/global-functions.rsc b/global-functions.rsc
index 3b7ff7cf..35dd0e0f 100644
--- a/global-functions.rsc
+++ b/global-functions.rsc
@@ -586,12 +586,12 @@
         ("https://api.macvendors.com/" . [ :pick $Mac 0 8 ]) output=user as-value ]->"data");
     :return $Vendor;
   } on-error={
-    :do {
+    :onerror Err {
       /tool/fetch check-certificate=yes-without-crl ("https://api.macvendors.com/") \
         output=none as-value;
       $LogPrint debug $0 ("The mac vendor is not known in database.");
-    } on-error={
-      $LogPrint warning $0 ("Failed getting mac vendor.");
+    } do={
+      $LogPrint warning $0 ("Failed getting mac vendor: " . $Err);
     }
     :return "unknown vendor";
   }

From 09f9826760316c35cb229bde4d065c89290c6076 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Thu, 8 May 2025 09:27:50 +0200
Subject: [PATCH 145/179] global-functions: $MkDir: :do ... on-error=... ->
 :onerror ... do=...

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

diff --git a/global-functions.rsc b/global-functions.rsc
index 35dd0e0f..271e3a25 100644
--- a/global-functions.rsc
+++ b/global-functions.rsc
@@ -894,11 +894,11 @@
 
     $LogPrint info $0 ("Creating disk of type tmpfs.");
     $RmDir "tmpfs";
-    :do {
+    :onerror Err {
       /disk/add slot=tmpfs type=tmpfs tmpfs-max-size=([ /system/resource/get total-memory ] / 3);
       $WaitForFile "tmpfs";
-    } on-error={
-      $LogPrint warning $0 ("Creating disk of type tmpfs failed!");
+    } do={
+      $LogPrint warning $0 ("Creating disk of type tmpfs failed: " . $Err);
       :return false;
     }
     :return true;
@@ -923,11 +923,11 @@
     }
   }
 
-  :do {
+  :onerror Err {
     /file/add type="directory" name=$Path;
     $WaitForFile $Path;
-  } on-error={
-    $LogPrint warning $0 ("Making directory '" . $Path . "' failed!");
+  } do={
+    $LogPrint warning $0 ("Making directory '" . $Path . "' failed: " . $Err);
     :return false;
   }
 

From 86a8919ed2f87d75b2150b09ec5f237dc93f046e Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Thu, 8 May 2025 09:29:22 +0200
Subject: [PATCH 146/179] global-functions: $RmDir: :do ... on-error=... ->
 :onerror ... do=...

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

diff --git a/global-functions.rsc b/global-functions.rsc
index 271e3a25..f0256fc6 100644
--- a/global-functions.rsc
+++ b/global-functions.rsc
@@ -1052,10 +1052,10 @@
     :return true;
   }
 
-  :do {
+  :onerror Err {
     /file/remove $Dir;
-  } on-error={
-    $LogPrint error $0 ("Removing directory '" . $DirName . "' (" . $Dir . ") failed.");
+  } do={
+    $LogPrint error $0 ("Removing directory '" . $DirName . "' (" . $Dir . ") failed: " . $Err);
     :return false;
   }
   :return true;

From 2317013121f8b3a53dd588f0fa5020b61ba7da53 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Thu, 8 May 2025 09:30:08 +0200
Subject: [PATCH 147/179] global-functions: $RmFile: :do ... on-error=... ->
 :onerror ... do=...

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

diff --git a/global-functions.rsc b/global-functions.rsc
index f0256fc6..c8832911 100644
--- a/global-functions.rsc
+++ b/global-functions.rsc
@@ -1080,10 +1080,10 @@
     :return true;
   }
 
-  :do {
+  :onerror Err {
     /file/remove $File;
-  } on-error={
-    $LogPrint error $0 ("Removing file '" . $FileName . "' (" . $File . ") failed.");
+  } do={
+    $LogPrint error $0 ("Removing file '" . $FileName . "' (" . $File . ") failed: " . $Err);
     :return false;
   }
   :return true;

From 12926b7c429f93a2579b134deef245793195744b Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Thu, 8 May 2025 09:33:39 +0200
Subject: [PATCH 148/179] global-functions: $ScriptInstallUpdate: :do ...
 on-error=... -> :onerror ... do=...

---
 global-functions.rsc | 28 +++++++++++++---------------
 1 file changed, 13 insertions(+), 15 deletions(-)

diff --git a/global-functions.rsc b/global-functions.rsc
index c8832911..1bbc77e4 100644
--- a/global-functions.rsc
+++ b/global-functions.rsc
@@ -1201,7 +1201,7 @@
         }
       }
 
-      :do {
+      :onerror Err {
         :local BaseUrl [ $EitherOr ($ScriptInfo->"base-url") $ScriptUpdatesBaseUrl ];
         :local UrlSuffix [ $EitherOr ($ScriptInfo->"url-suffix") $ScriptUpdatesUrlSuffix ];
         :local Url ($BaseUrl . $ScriptVal->"name" . ".rsc" . $UrlSuffix);
@@ -1211,13 +1211,11 @@
         :if ($Result->"status" = "finished") do={
           :set SourceNew [ :tolf ($Result->"data") ];
         }
-      } on-error={
+      } do={
+        $LogPrint warning $0 ("Failed fetching script '" . $ScriptVal->"name" . . "': " . $Err);
         :if ($ScriptVal->"source" = "#!rsc by RouterOS\n") do={
-          $LogPrint warning $0 ("Failed fetching script '" . $ScriptVal->"name" . \
-            "', removing dummy. Typo on installation?");
+          $LogPrint warning $0 ("Removing dummy. Typo on installation?");
           /system/script/remove $Script;
-        } else={
-          $LogPrint warning $0 ("Failed fetching script '" . $ScriptVal->"name" . "'!");
         }
         :error false;
       }
@@ -1304,7 +1302,7 @@
     :global GlobalConfigMigration;
     :local ChangeLogCode;
 
-    :do {
+    :onerror Err {
       :local Url ($ScriptUpdatesBaseUrl . "news-and-changes.rsc" . $ScriptUpdatesUrlSuffix);
       $LogPrint debug $0 ("Fetching news, changes and migration: " . $Url);
       :local Result [ /tool/fetch check-certificate=yes-without-crl \
@@ -1312,16 +1310,16 @@
       :if ($Result->"status" = "finished") do={
         :set ChangeLogCode ($Result->"data");
       }
-    } on-error={
-      $LogPrint warning $0 ("Failed fetching news, changes and migration!");
+    } do={
+      $LogPrint warning $0 ("Failed fetching news, changes and migration: " . $Err);
     }
 
     :if ([ :len $ChangeLogCode ] > 0) do={
       :if ([ $ValidateSyntax $ChangeLogCode ] = true) do={
-        :do {
+        :onerror Err {
           [ :parse $ChangeLogCode ];
-        } on-error={
-          $LogPrint warning $0 ("The changelog failed to run!");
+        } do={
+          $LogPrint warning $0 ("The changelog failed to run: " . $Err);
         }
       } else={
         $LogPrint warning $0 ("The changelog failed syntax validation!");
@@ -1343,10 +1341,10 @@
           }
 
           $LogPrint info $0 ("Applying migration for change " . $I . ": " . $Migration);
-          :do {
+          :onerror Err {
             [ :parse $Migration ];
-          } on-error={
-            $LogPrint warning $0 ("Migration code for change " . $I . " failed to run!");
+          } do={
+            $LogPrint warning $0 ("Migration code for change " . $I . " failed to run: " . $Err);
           }
         } on-error={ }
       }

From f5c4378676ef1e791738106723071c3dd6fe65ca Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Thu, 8 May 2025 09:37:18 +0200
Subject: [PATCH 149/179] global-functions: $ValidateSyntax: :do ...
 on-error=... -> :onerror ... do=...

---
 global-functions.rsc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/global-functions.rsc b/global-functions.rsc
index 1bbc77e4..11ab6770 100644
--- a/global-functions.rsc
+++ b/global-functions.rsc
@@ -1652,9 +1652,9 @@
 :set ValidateSyntax do={
   :local Code [ :tostr $1 ];
 
-  :do {
+  :onerror Err {
     [ :parse (":local Validate do={\n" . $Code . "\n}") ];
-  } on-error={
+  } do={
     :return false;
   }
   :return true;

From 8b1b73c936c0a0172383a521f7bc5fb70d9d2f14 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Thu, 8 May 2025 09:39:17 +0200
Subject: [PATCH 150/179] global-functions: $ValidateSyntax: add debug output

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

diff --git a/global-functions.rsc b/global-functions.rsc
index 11ab6770..51b47b55 100644
--- a/global-functions.rsc
+++ b/global-functions.rsc
@@ -1652,9 +1652,12 @@
 :set ValidateSyntax do={
   :local Code [ :tostr $1 ];
 
+  :global LogPrint;
+
   :onerror Err {
     [ :parse (":local Validate do={\n" . $Code . "\n}") ];
   } do={
+    $LogPrint debug $0 ("Valdation failed: " . $Err);
     :return false;
   }
   :return true;

From 5c599beae1c539ef4b657a6d8cb32195b4bfa174 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Thu, 8 May 2025 09:40:41 +0200
Subject: [PATCH 151/179] global-functions: :do ... on-error=... -> :onerror
 ... do=...

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

diff --git a/global-functions.rsc b/global-functions.rsc
index 51b47b55..8331e4a7 100644
--- a/global-functions.rsc
+++ b/global-functions.rsc
@@ -1771,10 +1771,10 @@
 :foreach Script in=[ /system/script/find where name ~ "^mod/." ] do={
   :local ScriptVal [ /system/script/get $Script ];
   :if ([ $ValidateSyntax ($ScriptVal->"source") ] = true) do={
-    :do {
+    :onerror Err {
       /system/script/run $Script;
-    } on-error={
-      $LogPrint error $0 ("Module '" . $ScriptVal->"name" . "' failed to run.");
+    } do={
+      $LogPrint error $0 ("Module '" . $ScriptVal->"name" . "' failed to run: " . $Err);
     }
   } else={
     $LogPrint error $0 ("Module '" . $ScriptVal->"name" . "' failed syntax validation, skipping.");

From d5f9ecebfbda885c4600ff99ee2713a5827e0398 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Thu, 8 May 2025 09:41:57 +0200
Subject: [PATCH 152/179] gps-track: :do ... on-error=... -> :onerror ...
 do=...

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

diff --git a/gps-track.rsc b/gps-track.rsc
index 4cc50663..6a090bfe 100644
--- a/gps-track.rsc
+++ b/gps-track.rsc
@@ -34,7 +34,7 @@
   :local Gps [ /system/gps/monitor once as-value ];
 
   :if ($Gps->"valid" = true) do={
-    :do {
+    :onerror Err {
       /tool/fetch check-certificate=yes-without-crl output=none http-method=post \
         http-header-field=({ [ $FetchUserAgentStr $ScriptName ]; "Content-Type: application/json" }) \
         http-data=[ :serialize to=json { "identity"=$Identity; \
@@ -42,8 +42,8 @@
       $LogPrint debug $ScriptName ("Sending GPS data in " . $CoordinateFormat . " format: " . \
         "lat: " . ($Gps->"latitude") . " " . \
         "lon: " . ($Gps->"longitude"));
-    } on-error={
-      $LogPrint warning $ScriptName ("Failed sending GPS data!");
+    } do={
+      $LogPrint warning $ScriptName ("Failed sending GPS data: " . $Err);
     }
   } else={
     $LogPrint debug $ScriptName ("GPS data not valid.");

From c1e6348bb9ffaaa9e43dafab039ec261614e0711 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Thu, 8 May 2025 09:42:48 +0200
Subject: [PATCH 153/179] lease-script: :do ... on-error=... -> :onerror ...
 do=...

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

diff --git a/lease-script.rsc b/lease-script.rsc
index b166ee3b..ab449568 100644
--- a/lease-script.rsc
+++ b/lease-script.rsc
@@ -53,11 +53,11 @@
   }
 
   :foreach Order,Script in=$RunOrder do={
-    :do {
+    :onerror Err {
       $LogPrint debug $ScriptName ("Running script with order " . $Order . ": " . $Script);
       /system/script/run $Script;
-    } on-error={
-      $LogPrint warning $ScriptName ("Running script '" . $Script . "' failed!");
+    } do={
+      $LogPrint warning $ScriptName ("Running script '" . $Script . "' failed: " . $Err);
     }
   }
 } do={

From 5badafe109c6514a83b2935aa3543054eb20ddc3 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Thu, 8 May 2025 09:54:51 +0200
Subject: [PATCH 154/179] mod/notification-telegram: :do ... on-error=... ->
 :onerror ... do=...

---
 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 51c8dbf7..0832b07e 100644
--- a/mod/notification-telegram.rsc
+++ b/mod/notification-telegram.rsc
@@ -38,14 +38,14 @@
 
   :foreach Id,Message in=$TelegramQueue do={
     :if ([ :typeof $Message ] = "array" ) do={
-      :do {
+      :onerror Err {
         :local Data ([ /tool/fetch check-certificate=yes-without-crl output=user http-method=post \
           ("https://api.telegram.org/bot" . ($Message->"tokenid") . "/sendMessage") \
           http-data=($Message->"http-data") as-value ]->"data");
         :set ($TelegramQueue->$Id);
         :set ($TelegramMessageIDs->[ :tostr ([ :deserialize from=json value=$Data ]->"result"->"message_id") ]) 1;
-      } on-error={
-        $LogPrint debug $0 ("Sending queued Telegram message failed.");
+      } do={
+        $LogPrint debug $0 ("Sending queued Telegram message failed: " . $Err);
         :set AllDone false;
       }
     }
@@ -72,12 +72,12 @@
   }
 
   :local Data;
-  :do {
+  :onerror Err {
     :set Data ([ /tool/fetch check-certificate=yes-without-crl output=user \
        ("https://api.telegram.org/bot" . $TelegramTokenId . "/getUpdates?offset=0" . \
        "&allowed_updates=%5B%22message%22%5D") as-value ]->"data");
-  } on-error={
-    $LogPrint warning $0 ("Fetching data failed!");
+  } do={
+    $LogPrint warning $0 ("Fetching data failed: " . $Err);
     :return false;
   }
 
@@ -190,7 +190,7 @@
   :local HTTPData ("chat_id=" . $ChatId . "&disable_notification=" . ($Notification->"silent") . \
       "&reply_to_message_id=" . ($Notification->"replyto") . "&message_thread_id=" . $ThreadId . \
        "&disable_web_page_preview=true&parse_mode=MarkdownV2");
-  :do {
+  :onerror Err {
     :if ([ $CertificateAvailable "Go Daddy Root Certificate Authority - G2" ] = false) do={
       $LogPrint warning $0 ("Downloading required certificate failed.");
       :error false;
@@ -199,8 +199,8 @@
       ("https://api.telegram.org/bot" . $TokenId . "/sendMessage") \
       http-data=($HTTPData . "&text=" . [ $UrlEncode $Text ]) as-value ]->"data");
     :set ($TelegramMessageIDs->[ :tostr ([ :deserialize from=json value=$Data ]->"result"->"message_id") ]) 1;
-  } on-error={
-    $LogPrint info $0 ("Failed sending Telegram notification! Queuing...");
+  } do={
+    $LogPrint info $0 ("Failed sending Telegram notification: " . $Err . " - Queuing...");
 
     :if ([ :typeof $TelegramQueue ] = "nothing") do={
       :set TelegramQueue ({});

From 2a7fd7ea53d62cc9897643250bb04022f1377ae3 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Thu, 8 May 2025 09:55:55 +0200
Subject: [PATCH 155/179] mod/notification-ntfy: :do ... on-error=... ->
 :onerror ... do=...

---
 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 8e5688e8..71140209 100644
--- a/mod/notification-ntfy.rsc
+++ b/mod/notification-ntfy.rsc
@@ -36,13 +36,13 @@
 
   :foreach Id,Message in=$NtfyQueue do={
     :if ([ :typeof $Message ] = "array" ) do={
-      :do {
+      :onerror Err {
         /tool/fetch check-certificate=yes-without-crl output=none http-method=post \
           http-header-field=($Message->"headers") http-data=($Message->"text") \
           ($Message->"url") as-value;
         :set ($NtfyQueue->$Id);
-      } on-error={
-        $LogPrint debug $0 ("Sending queued Ntfy message failed.");
+      } do={
+        $LogPrint debug $0 ("Sending queued Ntfy message failed: " . $Err);
         :set AllDone false;
       }
     }
@@ -107,7 +107,7 @@
     :set Text ($Text . "\n" . [ $SymbolForNotification "link" ] . ($Notification->"link"));
   }
 
-  :do {
+  :onerror Err {
     :if ($Server = "ntfy.sh") do={
       :if ([ $CertificateAvailable "ISRG Root X1" ] = false) do={
         $LogPrint warning $0 ("Downloading required certificate failed.");
@@ -116,8 +116,8 @@
     }
     /tool/fetch check-certificate=yes-without-crl output=none http-method=post \
       http-header-field=$Headers http-data=$Text $Url as-value;
-  } on-error={
-    $LogPrint info $0 ("Failed sending ntfy notification! Queuing...");
+  } do={
+    $LogPrint info $0 ("Failed sending ntfy notification: " . $Err . " - Queuing...");
 
     :if ([ :typeof $NtfyQueue ] = "nothing") do={
       :set NtfyQueue ({});

From 3f092d34774ac500faec0870e89a048a26a5bbf0 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Thu, 8 May 2025 09:57:31 +0200
Subject: [PATCH 156/179] mod/notification-matrix: :do ... on-error=... ->
 :onerror ... do=...

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

diff --git a/mod/notification-matrix.rsc b/mod/notification-matrix.rsc
index c8cf887c..e9b42a0d 100644
--- a/mod/notification-matrix.rsc
+++ b/mod/notification-matrix.rsc
@@ -39,7 +39,7 @@
 
   :foreach Id,Message in=$MatrixQueue do={
     :if ([ :typeof $Message ] = "array" ) do={
-      :do {
+      :onerror Err {
         /tool/fetch check-certificate=yes-without-crl output=none \
             http-header-field=($Message->"headers") http-method=post \
             http-data=[ :serialize to=json { "msgtype"="m.text"; "body"=($Message->"plain");
@@ -47,8 +47,8 @@
             ("https://" . $Message->"homeserver" . "/_matrix/client/r0/rooms/" . $Message->"room" . \
             "/send/m.room.message?access_token=" . $Message->"accesstoken") as-value;
         :set ($MatrixQueue->$Id);
-      } on-error={
-        $LogPrint debug $0 ("Sending queued Matrix message failed.");
+      } do={
+        $LogPrint debug $0 ("Sending queued Matrix message failed: " . $Err);
         :set AllDone false;
       }
     }
@@ -129,15 +129,15 @@
       [ $PrepareText $Label ] . "</a>");
   }
 
-  :do {
+  :onerror Err {
     /tool/fetch check-certificate=yes-without-crl output=none \
         http-header-field=$Headers http-method=post \
         http-data=[ :serialize to=json { "msgtype"="m.text"; "body"=$Plain;
         "format"="org.matrix.custom.html"; "formatted_body"=$Formatted } ] \
         ("https://" . $HomeServer . "/_matrix/client/r0/rooms/" . $Room . \
         "/send/m.room.message?access_token=" . $AccessToken) as-value;
-  } on-error={
-    $LogPrint info $0 ("Failed sending Matrix notification! Queuing...");
+  } do={
+    $LogPrint info $0 ("Failed sending Matrix notification: " . $Err . " - Queuing...");
 
     :if ([ :typeof $MatrixQueue ] = "nothing") do={
       :set MatrixQueue ({});
@@ -196,14 +196,14 @@
   :global MatrixHomeServer;
 
   :local Domain [ :pick $User ([ :find $User ":" ] + 1) [ :len $User] ];
-  :do {
+  :onerror Err {
     :local Data ([ /tool/fetch check-certificate=yes-without-crl output=user \
         http-header-field=({ [ $FetchUserAgentStr $0 ] }) \
         ("https://" . $Domain . "/.well-known/matrix/client") as-value ]->"data");
     :set MatrixHomeServer ([ :deserialize from=json value=$Data ]->"m.homeserver"->"base_url");
     $LogPrint debug $0 ("Home server is: " . $MatrixHomeServer);
-  } on-error={
-    $LogPrint error $0 ("Failed getting home server!");
+  } do={
+    $LogPrint error $0 ("Failed getting home server: " . $Err);
     :return false;
   }
 
@@ -211,27 +211,27 @@
     :set MatrixHomeServer [ :pick $MatrixHomeServer 8 [ :len $MatrixHomeServer ] ];
   }
 
-  :do {
+  :onerror Err {
     :local Data ([ /tool/fetch check-certificate=yes-without-crl output=user \
         http-header-field=({ [ $FetchUserAgentStr $0 ] }) http-method=post \
         http-data=[ :serialize to=json { "type"="m.login.password"; "user"=$User; "password"=$Pass } ] \
         ("https://" . $MatrixHomeServer . "/_matrix/client/r0/login") as-value ]->"data");
     :set MatrixAccessToken ([ :deserialize from=json value=$Data ]->"access_token");
     $LogPrint debug $0 ("Access token is: " . $MatrixAccessToken);
-  } on-error={
-    $LogPrint error $0 ("Failed logging in (and getting access token)!");
+  } do={
+    $LogPrint error $0 ("Failed logging in (and getting access token): " . $Err);
     :return false;
   }
 
-  :do {
+  :onerror Err {
     /system/script/remove [ find where name="global-config-overlay.d/mod/notification-matrix" ];
     /system/script/add name="global-config-overlay.d/mod/notification-matrix" source=( \
       "# configuration snippet: mod/notification-matrix\n\n" . \
       ":global MatrixHomeServer \"" . $MatrixHomeServer . "\";\n" . \
       ":global MatrixAccessToken \"" . $MatrixAccessToken . "\";\n");
     $LogPrint info $0 ("Added configuration snippet. Now create and join a room, please!");
-  } on-error={
-    $LogPrint error $0 ("Failed adding configuration snippet!");
+  } do={
+    $LogPrint error $0 ("Failed adding configuration snippet: " . $Err);
     :return false;
   }
 }
@@ -248,24 +248,24 @@
   :global MatrixHomeServer;
   :global MatrixRoom;
 
-  :do {
+  :onerror Err {
     /tool/fetch check-certificate=yes-without-crl output=none \
         http-header-field=({ [ $FetchUserAgentStr $0 ] }) http-method=post http-data="" \
         ("https://" . $MatrixHomeServer . "/_matrix/client/r0/rooms/" . [ $UrlEncode $MatrixRoom ] . \
         "/join?access_token=" . [ $UrlEncode $MatrixAccessToken ]) as-value;
     $LogPrint debug $0 ("Joined the room.");
-  } on-error={
-    $LogPrint error $0 ("Failed joining the room!");
+  } do={
+    $LogPrint error $0 ("Failed joining the room: " . $Err);
     :return false;
   }
 
-  :do {
+  :onerror Err {
     :local Snippet [ /system/script/find where name="global-config-overlay.d/mod/notification-matrix" ];
     /system/script/set $Snippet source=([ get $Snippet source ] . \
       ":global MatrixRoom \"" . $MatrixRoom . "\";\n");
     $LogPrint info $0 ("Appended configuration to configuration snippet. Please review!");
-  } on-error={
-    $LogPrint error $0 ("Failed appending configuration to snippet!");
+  } do={
+    $LogPrint error $0 ("Failed appending configuration to snippet: " . $Err);
     :return false;
   }
 }

From e01873301f7a92fc0109d8afce845a175f414504 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Thu, 8 May 2025 09:58:53 +0200
Subject: [PATCH 157/179] mod/notification-gotify: :do ... on-error=... ->
 :onerror ... do=...

---
 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 3ae4cdd3..d8eafbe0 100644
--- a/mod/notification-gotify.rsc
+++ b/mod/notification-gotify.rsc
@@ -37,13 +37,13 @@
 
   :foreach Id,Message in=$GotifyQueue do={
     :if ([ :typeof $Message ] = "array" ) do={
-      :do {
+      :onerror Err {
         /tool/fetch check-certificate=yes-without-crl output=none http-method=post \
           http-header-field=($Message->"headers") http-data=[ :serialize to=json ($Message->"message") ] \
           ($Message->"url") as-value;
         :set ($GotifyQueue->$Id);
-      } on-error={
-        $LogPrint debug $0 ("Sending queued Gotify message failed.");
+      } do={
+        $LogPrint debug $0 ("Sending queued Gotify message failed: " . $Err);
         :set AllDone false;
       }
     }
@@ -91,11 +91,11 @@
       ("\n" . [ $SymbolForNotification "link" ] . ($Notification->"link")) ]); \
     "priority"=[ :tonum [ $IfThenElse ($Notification->"silent") 2 5 ] ] });
 
-  :do {
+  :onerror Err {
     /tool/fetch check-certificate=yes-without-crl output=none http-method=post \
       http-header-field=$Headers http-data=[ :serialize to=json $Message ] $Url as-value;
-  } on-error={
-    $LogPrint info $0 ("Failed sending Gotify notification! Queuing...");
+  } do={
+    $LogPrint info $0 ("Failed sending Gotify notification: " . $Err . " - Queuing...");
 
     :if ([ :typeof $GotifyQueue ] = "nothing") do={
       :set GotifyQueue ({});

From 314e68e4cd3d097d510cb0bef25fec838421b689 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Thu, 8 May 2025 09:45:59 +0200
Subject: [PATCH 158/179] mode-button: :do ... on-error=... -> :onerror ...
 do=...

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

diff --git a/mode-button.rsc b/mode-button.rsc
index c6422f0b..d82f8995 100644
--- a/mode-button.rsc
+++ b/mode-button.rsc
@@ -69,11 +69,11 @@
             :delay 200ms;
           }
 
-          :do {
+          :onerror Err {
             [ :parse $Code ];
-          } on-error={
+          } do={
             $LogPrint warning $FuncName \
-                ("The code for " . $Count . " mode-button presses failed with runtime error!");
+                ("The code for " . $Count . " mode-button presses failed with runtime error: " . $Err);
           }
         } else={
           $LogPrint warning $FuncName \

From 9ae21c00bdbbda52fea6c2cc32248d714617f1f8 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Thu, 8 May 2025 10:02:15 +0200
Subject: [PATCH 159/179] mod/scriptrunonce: :do ... on-error=... -> :onerror
 ... do=...

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

diff --git a/mod/scriptrunonce.rsc b/mod/scriptrunonce.rsc
index 3797c155..1d6aaf1f 100644
--- a/mod/scriptrunonce.rsc
+++ b/mod/scriptrunonce.rsc
@@ -41,11 +41,11 @@
       :return false;
     }
 
-    :do {
+    :onerror Err {
       $LogPrint info $0 ("Running script '" . $Script . "' now.");
       [ :parse $Source ];
-    } on-error={
-      $LogPrint warning $0 ("The script '" . $Script . "' failed to run!");
+    } do={
+      $LogPrint warning $0 ("The script '" . $Script . "' failed to run: " . $Err);
       :return false;
     }
 

From 9cd4ed08a475b93fbf11266dc5a0804afd58e195 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Thu, 8 May 2025 10:05:12 +0200
Subject: [PATCH 160/179] mod/ssh-keys-import: :do ... on-error=... -> :onerror
 ... do=...

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

diff --git a/mod/ssh-keys-import.rsc b/mod/ssh-keys-import.rsc
index 9a6cd398..176c1b46 100644
--- a/mod/ssh-keys-import.rsc
+++ b/mod/ssh-keys-import.rsc
@@ -55,13 +55,13 @@
   /file/add name=$FileName contents=($Key . ", md5=" . $FingerPrintMD5);
   $WaitForFile $FileName;
 
-  :do {
+  :onerror Err {
     /user/ssh-keys/import public-key-file=$FileName user=$User;
     $LogPrint info $0 ("Imported ssh public key (" . $KeyVal->2 . ", " . $KeyVal->0 . ", " . \
       "MD5:" . $FingerPrintMD5 . ") for user '" . $User . "'.");
     $RmDir "tmpfs/ssh-keys-import";
-  } on-error={
-    $LogPrint warning $0 ("Failed importing key.");
+  } do={
+    $LogPrint warning $0 ("Failed importing key: " . $Err);
     $RmDir "tmpfs/ssh-keys-import";
     :return false;
   }

From c757064eb9537321b7cad69db6e05ddc9c576583 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Thu, 8 May 2025 10:05:39 +0200
Subject: [PATCH 161/179] =?UTF-8?q?mod/ssh-keys-import:=20:do=20...=20on-e?=
 =?UTF-8?q?rror=3D...=20->=20...=20well...=20-=20fix=20condition=20?=
 =?UTF-8?q?=F0=9F=A5=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mod/ssh-keys-import.rsc | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/mod/ssh-keys-import.rsc b/mod/ssh-keys-import.rsc
index 176c1b46..94675255 100644
--- a/mod/ssh-keys-import.rsc
+++ b/mod/ssh-keys-import.rsc
@@ -94,9 +94,7 @@
   :foreach KeyVal in=[ :deserialize $Keys delimiter=" " from=dsv options=dsv.plain ] do={
     :local Continue false;
     :if ($KeyVal->0 = "ssh-ed25519" || $KeyVal->0 = "ssh-rsa") do={
-      :do {
-        $SSHKeysImport ($KeyVal->0 . " " . $KeyVal->1 . " " . $KeyVal->2) $User;
-      } on-error={
+      :if ([ $SSHKeysImport ($KeyVal->0 . " " . $KeyVal->1 . " " . $KeyVal->2) $User ] = false) do={
         $LogPrint warning $0 ("Failed importing key for user '" . $User . "'.");
       }
       :set Continue true;

From a523f9793861d8927388f18bb5f2319bbe04c0b8 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Thu, 8 May 2025 10:07:30 +0200
Subject: [PATCH 162/179] netwatch-dns: :do ... on-error=... -> :onerror ...
 do=...

---
 netwatch-dns.rsc | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/netwatch-dns.rsc b/netwatch-dns.rsc
index 3da14987..4fa076af 100644
--- a/netwatch-dns.rsc
+++ b/netwatch-dns.rsc
@@ -118,15 +118,15 @@
     }
 
     :local Data false;
-    :do {
+    :onerror Err {
       :set Data ([ /tool/fetch check-certificate=yes-without-crl output=user \
         http-header-field=({ "accept: application/dns-message" }) \
         url=(($DohServer->"doh-url") . "?dns=" . [ :convert to=base64 ([ :rndstr length=2 ] . \
         "\01\00" . "\00\01" . "\00\00" . "\00\00" . "\00\00" . "\09doh-check\05eworm\02de\00" . \
         "\00\10" . "\00\01") ]) as-value ]->"data");
-    } on-error={
-      $LogPrint warning $ScriptName ("Request to DoH server failed (network or certificate issue): " . \
-        ($DohServer->"doh-url"));
+    } do={
+      $LogPrint warning $ScriptName ("Request to DoH server " . ($DohServer->"doh-url") . \
+          " failed: " . $Err);
     }
 
     :if ($Data != false) do={

From fefe59751f1487fbdd4feace39c32445bd97547c Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Thu, 8 May 2025 10:09:59 +0200
Subject: [PATCH 163/179] netwatch-notify: :do ... on-error=... -> :onerror ...
 do=...

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

diff --git a/netwatch-notify.rsc b/netwatch-notify.rsc
index fb8e8d5e..00f03cde 100644
--- a/netwatch-notify.rsc
+++ b/netwatch-notify.rsc
@@ -38,10 +38,10 @@
     :global ValidateSyntax;
 
     :if ([ $ValidateSyntax $Hook ] = true) do={
-      :do {
+      onerror Err {
         [ :parse $Hook ];
-      } on-error={
-        $LogPrint warning $ScriptName ("The " . $State . "-hook for " . $Type . " '" . $Name . "' failed to run.");
+      } do={
+        $LogPrint warning $ScriptName ("The " . $State . "-hook for " . $Type . " '" . $Name . "' failed to run: " . $Err);
         :return ("The hook failed to run.");
       }
     } else={
@@ -107,7 +107,7 @@
 
       :if ([ :typeof ($HostInfo->"resolve") ] = "str") do={
         :if ([ $IsDNSResolving ] = true) do={
-          :do {
+          :onerror Err {
             :local Resolve [ :resolve type=[ $IfThenElse ([ :typeof ($HostVal->"host") ] = "ip") \
                 "ipv4" "ipv6" ] ($HostInfo->"resolve") ];
             :if ($Resolve != $HostVal->"host") do={
@@ -121,13 +121,13 @@
                 :set ($HostVal->"status") "unknown";
               }
             }
-          } on-error={
+          } do={
             :set ($Metric->"resolve-failcnt") ($Metric->"resolve-failcnt" + 1);
             :if ($Metric->"resolve-failcnt" = 3) do={
               $LogPrint [ $IfThenElse ($HostInfo->"no-resolve-fail" != true) warning debug ] \
                   $ScriptName ("Resolving name '" . $HostInfo->"resolve" . [ $IfThenElse \
                   ($HostInfo->"resolve" != $HostInfo->"name") ("' for " . $Type . " '" . \
-                  $HostInfo->"name") "" ] . "' failed.");
+                  $HostInfo->"name") "" ] . "' failed: " . $Err);
             }
           }
         }

From d0adf9974e75668fc16e736ce2dc29a1477b10b8 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Thu, 8 May 2025 10:12:08 +0200
Subject: [PATCH 164/179] sms-forward: :do ... on-error=... -> :onerror ...
 do=...

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

diff --git a/sms-forward.rsc b/sms-forward.rsc
index a564056a..feb640e5 100644
--- a/sms-forward.rsc
+++ b/sms-forward.rsc
@@ -74,12 +74,12 @@
           :if ($Phone~($Hook->"allowed-number") && ($SmsVal->"message")~($Hook->"match")) do={
             :if ([ $ValidateSyntax ($Hook->"command") ] = true) do={
               $LogPrint info $ScriptName ("Running hook '" . $Hook->"match" . "': " . $Hook->"command");
-              :do {
+              :onerror Err {
                 :local Command [ :parse ($Hook->"command") ];
                 $Command Phone=$Phone Message=($SmsVal->"message");
                 :set Messages ($Messages . "\n\nRan hook '" . $Hook->"match" . "':\n" . $Hook->"command");
-              } on-error={
-                $LogPrint warning $ScriptName ("The code for hook '" . $Hook->"match" . "' failed to run!");
+              } do={
+                $LogPrint warning $ScriptName ("The code for hook '" . $Hook->"match" . "' failed to run: " . $Err);
               }
             } else={
               $LogPrint warning $ScriptName ("The code for hook '" . $Hook->"match" . "' failed syntax validation!");

From f22d46da96dfe0c421172d30ee1baf9976205329 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Thu, 8 May 2025 10:13:05 +0200
Subject: [PATCH 165/179] telegram-chat: :do ... on-error=... -> :onerror ...
 do=...

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

diff --git a/telegram-chat.rsc b/telegram-chat.rsc
index b1f7f99e..5bfa31c8 100644
--- a/telegram-chat.rsc
+++ b/telegram-chat.rsc
@@ -70,14 +70,14 @@
   :local Data false;
   :for I from=1 to=4 do={
     :if ($Data = false) do={
-      :do {
+      :onerror Err {
         :set Data ([ /tool/fetch check-certificate=yes-without-crl output=user \
           ("https://api.telegram.org/bot" . $TelegramTokenId . "/getUpdates?offset=" . \
           $TelegramChatOffset->0 . "&allowed_updates=%5B%22message%22%5D") as-value ]->"data");
         :set TelegramRandomDelay [ $MAX 0 ($TelegramRandomDelay - 1) ];
-      } on-error={
+      } do={
         :if ($I < 4) do={
-          $LogPrint debug $ScriptName ("Fetch failed, " . $I . ". try.");
+          $LogPrint debug $ScriptName ("Fetch failed, " . $I . ". try: " . $Err);
           :set TelegramRandomDelay [ $MIN 15 ($TelegramRandomDelay + 5) ];
           :delay (($I * $I) . "s");
         }

From 10ac81634877858717a3d99fee418edc9887b377 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Thu, 8 May 2025 10:14:24 +0200
Subject: [PATCH 166/179] unattended-lte-firmware-upgrade: :do ... on-error=...
 -> :onerror ... do=...

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

diff --git a/unattended-lte-firmware-upgrade.rsc b/unattended-lte-firmware-upgrade.rsc
index 83925fd9..237c2d83 100644
--- a/unattended-lte-firmware-upgrade.rsc
+++ b/unattended-lte-firmware-upgrade.rsc
@@ -12,10 +12,10 @@
 :foreach Interface in=[ /interface/lte/find where running ] do={
   :local Firmware;
   :local IntName [ /interface/lte/get $Interface name ];
-  :do {
+  :onerror Err {
     :set Firmware [ /interface/lte/firmware-upgrade $Interface as-value ];
-  } on-error={
-    :log debug ("Could not get latest LTE firmware version for interface " . $IntName . ".");
+  } do={
+    :log debug ("Could not get latest LTE firmware version for interface " . $IntName . ": " . $Err);
   }
 
   :if ([ :typeof $Firmware ] = "array") do={
@@ -27,7 +27,7 @@
         :set LTEFirmwareUpgrade;
 
         /system/scheduler/remove ($1 . "-firmware-upgrade");
-        :do {
+        :onerror Err {
           /interface/lte/firmware-upgrade $1 upgrade=yes;
           :log info ("LTE firmware upgrade on '" . $1 . "' finished, waiting for reset.");
           :delay 240s;
@@ -36,8 +36,8 @@
                ($Firmware->"installed") != ($Firmware->"latest")) do={
             :log warning ("LTE firmware versions still differ. Upgrade failed anyway?");
           }
-        } on-error={
-          :log error ("LTE firmware upgrade on '" . $1 . "' failed.");
+        } do={
+          :log error ("LTE firmware upgrade on '" . $1 . "' failed: " . $Err);
         }
       }
 

From 205bcce6f9d49518f1e1999154d96b0e0bb6d1ed Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Thu, 8 May 2025 10:15:35 +0200
Subject: [PATCH 167/179] update-tunnelbroker: :do ... on-error=... -> :onerror
 ... do=...

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

diff --git a/update-tunnelbroker.rsc b/update-tunnelbroker.rsc
index 8e5e1d0f..9057e1e4 100644
--- a/update-tunnelbroker.rsc
+++ b/update-tunnelbroker.rsc
@@ -41,12 +41,12 @@
 
     :for I from=2 to=0 do={
       :if ($Data = false) do={
-        :do {
+        :onerror Err {
           :set Data ([ /tool/fetch check-certificate=yes-without-crl \
             ("https://ipv4.tunnelbroker.net/nic/update?hostname=" . $Comment->"id") \
             user=($Comment->"user") password=($Comment->"pass") output=user as-value ]->"data");
-        } on-error={
-          $LogPrint debug $ScriptName ("Failed downloading, " . $I . " retries pending.");
+        } do={
+          $LogPrint debug $ScriptName ("Failed downloading: " . $Err . " - " . $I . " retries pending.");
           :delay 2s;
         }
       }

From 3521995dbc1173e722819efca1908cd0df251b1d Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Thu, 8 May 2025 11:07:39 +0200
Subject: [PATCH 168/179] mod/inspectvar: use $CharacterMultiply

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

diff --git a/mod/inspectvar.rsc b/mod/inspectvar.rsc
index 89c02860..b864d9a8 100644
--- a/mod/inspectvar.rsc
+++ b/mod/inspectvar.rsc
@@ -33,11 +33,9 @@
     :local Value  [ :tostr $2 ];
     :local Level  [ :tonum $3 ];
 
-    :local Indent "";
-    :for I from=1 to=$Level step=1 do={
-      :set Indent ($Indent . "  ");
-    }
-    :return ($Indent . "-" . $Prefix . "-> " . $Value);
+    :global CharacterMultiply;
+
+    :return ([ $CharacterMultiply " " $Level ] . "-" . $Prefix . "-> " . $Value);
   }
 
   :local TypeOf [ :typeof $Input ];

From 187735f35f7b361b1cc6d45f703d5c121681254c Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Thu, 8 May 2025 11:12:02 +0200
Subject: [PATCH 169/179] mod/inspectvar: print the length for strings

---
 mod/inspectvar.rsc | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/mod/inspectvar.rsc b/mod/inspectvar.rsc
index b864d9a8..84c40d8f 100644
--- a/mod/inspectvar.rsc
+++ b/mod/inspectvar.rsc
@@ -39,6 +39,7 @@
   }
 
   :local TypeOf [ :typeof $Input ];
+  :local Len    [ :len $Input ];
   :local Return [ $IndentReturn "type" $TypeOf $Level ];
 
   :if ($TypeOf = "array") do={
@@ -48,6 +49,10 @@
         [ $InspectVarReturn $Value ($Level + 2) ]);
     }
   } else={
+    :if ($TypeOf = "str") do={
+      :set $Return ($Return . "\n" . \
+         [ $IndentReturn "len" $Len $Level ]);
+    }
     :if ($TypeOf != "nothing") do={
       :set $Return ($Return . "\n" . \
         [ $IndentReturn "value" [ $IfThenElse ([ :len $Input ] > 80) \

From 36f155ce621abe427d126a6ee3a3363bff15b2bb Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Thu, 8 May 2025 11:15:21 +0200
Subject: [PATCH 170/179] mod/inspectvar: remove CR, replace LF

---
 mod/inspectvar.rsc | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/mod/inspectvar.rsc b/mod/inspectvar.rsc
index 84c40d8f..b32480f3 100644
--- a/mod/inspectvar.rsc
+++ b/mod/inspectvar.rsc
@@ -25,6 +25,7 @@
   :local Input $1;
   :local Level (0 + [ :tonum $2 ]);
 
+  :global CharacterReplace;
   :global IfThenElse;
   :global InspectVarReturn;
 
@@ -52,6 +53,7 @@
     :if ($TypeOf = "str") do={
       :set $Return ($Return . "\n" . \
          [ $IndentReturn "len" $Len $Level ]);
+      :set Input [ $CharacterReplace [ $CharacterReplace $Input ("\r") "" ] ("\n") " " ];
     }
     :if ($TypeOf != "nothing") do={
       :set $Return ($Return . "\n" . \

From bd3cc3bbd49934f42fe9f6c6820501c7cc9d33ba Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Thu, 8 May 2025 13:35:49 +0200
Subject: [PATCH 171/179] mod/inspectvar: replace only when matching

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

diff --git a/mod/inspectvar.rsc b/mod/inspectvar.rsc
index b32480f3..fc1b366f 100644
--- a/mod/inspectvar.rsc
+++ b/mod/inspectvar.rsc
@@ -53,7 +53,12 @@
     :if ($TypeOf = "str") do={
       :set $Return ($Return . "\n" . \
          [ $IndentReturn "len" $Len $Level ]);
-      :set Input [ $CharacterReplace [ $CharacterReplace $Input ("\r") "" ] ("\n") " " ];
+      :if ([ :typeof [ :find $Input ("\r") ] ] = "num") do={
+        :set Input [ $CharacterReplace $Input ("\r") "" ];
+      }
+      :if ([ :typeof [ :find $Input ("\n") ] ] = "num") do={
+        :set Input [ $CharacterReplace $Input ("\n") " " ];
+      }
     }
     :if ($TypeOf != "nothing") do={
       :set $Return ($Return . "\n" . \

From ff218e4ce5032b2ead7f33f53382bda98f6e5e2e Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Thu, 8 May 2025 11:21:59 +0200
Subject: [PATCH 172/179] mod/notification-email: add error handling when
 sending mail

---
 mod/notification-email.rsc | 57 +++++++++++++++++++++-----------------
 1 file changed, 31 insertions(+), 26 deletions(-)

diff --git a/mod/notification-email.rsc b/mod/notification-email.rsc
index c0f9d860..e05a8131 100644
--- a/mod/notification-email.rsc
+++ b/mod/notification-email.rsc
@@ -89,35 +89,40 @@
 
   :foreach Id,Message in=$EmailQueue do={
     :if ([ :typeof $Message ] = "array" ) do={
-      :local Attach ({});
       :while ([ /tool/e-mail/get last-status ] = "in-progress") do={ :delay 1s; }
-      :foreach File in=[ :toarray [ $EitherOr ($Message->"attach") "" ] ] do={
-        :if ([ :len [ /file/find where name=$File ] ] = 1) do={
-          :set Attach ($Attach, $File);
-        } else={
-          $LogPrint warning $0 ("File '" . $File . "' does not exist, can not attach.");
-        }
-      }
-      /tool/e-mail/send from=[ $EMailGenerateFrom ] to=($Message->"to") cc=($Message->"cc") \
-        subject=($Message->"subject") body=($Message->"body") file=$Attach;
-      :local Wait true;
-      :do {
-        :delay 1s;
-        :local Status [ /tool/e-mail/get last-status ];
-        :if ($Status = "succeeded") do={
-          :set ($EmailQueue->$Id);
-          :set Wait false;
-          :if (($Message->"remove-attach") = true) do={
-            :foreach File in=$Attach do={
-              /file/remove $File;
-            }
+      :onerror Err {
+        :local Attach ({});
+        :foreach File in=[ :toarray [ $EitherOr ($Message->"attach") "" ] ] do={
+          :if ([ :len [ /file/find where name=$File ] ] = 1) do={
+            :set Attach ($Attach, $File);
+          } else={
+            $LogPrint warning $0 ("File '" . $File . "' does not exist, can not attach.");
           }
         }
-        :if ($Status = "failed") do={
-          :set AllDone false;
-          :set Wait false;
-        }
-      } while=($Wait = true);
+        /tool/e-mail/send from=[ $EMailGenerateFrom ] to=($Message->"to") cc=($Message->"cc") \
+          subject=($Message->"subject") body=($Message->"body") file=$Attach;
+        :local Wait true;
+        :do {
+          :delay 1s;
+          :local Status [ /tool/e-mail/get last-status ];
+          :if ($Status = "succeeded") do={
+            :set ($EmailQueue->$Id);
+            :set Wait false;
+            :if (($Message->"remove-attach") = true) do={
+              :foreach File in=$Attach do={
+                /file/remove $File;
+              }
+            }
+          }
+          :if ($Status = "failed") do={
+            :set AllDone false;
+            :set Wait false;
+          }
+        } while=($Wait = true);
+      } do={
+        $LogPrint warning $0 ("Sending queued mail failed: " . $Err);
+        :set AllDone false;
+      }
     }
   }
 

From 74dc809b98759cb337fbaf6b1fa98bb0137dadc0 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Thu, 8 May 2025 13:29:01 +0200
Subject: [PATCH 173/179] mod/notification-email: properly truncate the body

Truned out that the size limit for e-mail message/body is anywhere just
below 64kB... So truncate  at about 62.000 bytes.
---
 mod/notification-email.rsc | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/mod/notification-email.rsc b/mod/notification-email.rsc
index e05a8131..c799c874 100644
--- a/mod/notification-email.rsc
+++ b/mod/notification-email.rsc
@@ -181,6 +181,7 @@
   :global IfThenElse;
   :global NotificationEMailSignature;
   :global NotificationEMailSubject;
+  :global SymbolForNotification;
 
   :local To [ $EitherOr ($EmailGeneralToOverride->($Notification->"origin")) $EmailGeneralTo ];
   :local Cc [ $EitherOr ($EmailGeneralCcOverride->($Notification->"origin")) $EmailGeneralCc ];
@@ -193,13 +194,22 @@
   :if ([ :typeof $EmailQueue ] = "nothing") do={
       :set EmailQueue ({});
   }
+  :local Truncated false;
+  :local Body ($Notification->"message");
+  :if ([ :len $Body ] > 62000) do={
+    :set Body ([ :pick $Body 0 62000 ] . "...");
+    :set Truncated true;
+  }
   :local Signature [ $EitherOr [ $NotificationEMailSignature ] [ /system/note/get note ] ];
+  :set Body ($Body . "\n" . \
+      [ $IfThenElse ([ :len ($Notification->"link") ] > 0) ("\n" . ($Notification->"link")) ] . \
+      [ $IfThenElse ($Truncated = true) ("\n" . [ $SymbolForNotification "scissors" ] . \
+          "The message was too long and has been truncated!") ] . \
+      [ $IfThenElse ([ :len $Signature ] > 0) ("\n-- \n" . $Signature) "" ]);
   :set ($EmailQueue->[ :len $EmailQueue ]) {
     to=$To; cc=$Cc;
     subject=[ $NotificationEMailSubject ($Notification->"subject") ];
-    body=(($Notification->"message") . \
-      [ $IfThenElse ([ :len ($Notification->"link") ] > 0) ("\n\n" . ($Notification->"link")) "" ] . \
-      [ $IfThenElse ([ :len $Signature ] > 0) ("\n-- \n" . $Signature) "" ]); \
+    body=$Body; \
     attach=($Notification->"attach"); remove-attach=($Notification->"remove-attach") };
   :if ([ :len [ /system/scheduler/find where name="_FlushEmailQueue" ] ] = 0) do={
     /system/scheduler/add name="_FlushEmailQueue" interval=1s start-time=startup \

From 2a956874777c83748f4a2afea4e9ee1382928230 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Thu, 8 May 2025 14:54:42 +0200
Subject: [PATCH 174/179] mod/notification-email: add the link symbol

---
 mod/notification-email.rsc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/mod/notification-email.rsc b/mod/notification-email.rsc
index c799c874..52937668 100644
--- a/mod/notification-email.rsc
+++ b/mod/notification-email.rsc
@@ -202,7 +202,8 @@
   }
   :local Signature [ $EitherOr [ $NotificationEMailSignature ] [ /system/note/get note ] ];
   :set Body ($Body . "\n" . \
-      [ $IfThenElse ([ :len ($Notification->"link") ] > 0) ("\n" . ($Notification->"link")) ] . \
+      [ $IfThenElse ([ :len ($Notification->"link") ] > 0) \
+          ("\n" . [ $SymbolForNotification "link" ] . ($Notification->"link")) ] . \
       [ $IfThenElse ($Truncated = true) ("\n" . [ $SymbolForNotification "scissors" ] . \
           "The message was too long and has been truncated!") ] . \
       [ $IfThenElse ([ :len $Signature ] > 0) ("\n-- \n" . $Signature) "" ]);

From ce129ee4418a09d4b1987e3d94818a561d9fd384 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Sun, 11 May 2025 22:02:18 +0200
Subject: [PATCH 175/179] fw-addr-lists: for IPv6 the CIDR is always expected

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

diff --git a/fw-addr-lists.rsc b/fw-addr-lists.rsc
index 5a03875d..efd37db7 100644
--- a/fw-addr-lists.rsc
+++ b/fw-addr-lists.rsc
@@ -114,8 +114,8 @@
             :error true;
           }
           :if ($Address ~ "^[0-9a-zA-Z]*:[0-9a-zA-Z:\\.]+(/[0-9]{1,3})?\$") do={
-            :if ($Address ~ "/128\$") do={
-              :set Address [ :pick $Address 0 ([ :len $Address ] - 4) ];
+            :if ([ :typeof [ :find $Address "/" ] ] = "nil") do={
+              :set Address ($Address . "/128");
             }
             :set ($IPv6Addresses->$Branch->$Address) $TimeOut;
             :error true;

From e78c71948dfa847fd21820dffacd3c6e7165d832 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Mon, 12 May 2025 16:50:06 +0200
Subject: [PATCH 176/179] mod/notification-telegram: fix indention

---
 mod/notification-telegram.rsc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mod/notification-telegram.rsc b/mod/notification-telegram.rsc
index 0832b07e..2eb90e12 100644
--- a/mod/notification-telegram.rsc
+++ b/mod/notification-telegram.rsc
@@ -189,7 +189,7 @@
 
   :local HTTPData ("chat_id=" . $ChatId . "&disable_notification=" . ($Notification->"silent") . \
       "&reply_to_message_id=" . ($Notification->"replyto") . "&message_thread_id=" . $ThreadId . \
-       "&disable_web_page_preview=true&parse_mode=MarkdownV2");
+      "&disable_web_page_preview=true&parse_mode=MarkdownV2");
   :onerror Err {
     :if ([ $CertificateAvailable "Go Daddy Root Certificate Authority - G2" ] = false) do={
       $LogPrint warning $0 ("Downloading required certificate failed.");

From 1b5dd1e1d3555f347bd6ff587659ac8b8ec5c73e Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Mon, 12 May 2025 16:53:55 +0200
Subject: [PATCH 177/179] telegram-chat: support trusted group chat ids

But be warned: Adding a person to a trusted group will give
her/him administrative control over the device(s) - without
changes on the device itself!

On the other hand... Removing permissions is easily done by removing
a person from a group.

Closes: https://github.com/eworm-de/routeros-scripts/issues/101
---
 telegram-chat.rsc | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/telegram-chat.rsc b/telegram-chat.rsc
index 5bfa31c8..50fc0cce 100644
--- a/telegram-chat.rsc
+++ b/telegram-chat.rsc
@@ -107,7 +107,9 @@
       :local ThreadId [ $IfThenElse ($Message->"is_topic_message") ($Message->"message_thread_id") "" ];
 
       :foreach IdsTrusted in=($TelegramChatId, $TelegramChatIdsTrusted) do={
-        :if ($From->"id" = $IdsTrusted || $From->"username" = $IdsTrusted) do={
+        :if ($From->"id" = $IdsTrusted || \
+             $From->"username" = $IdsTrusted || \
+             $Chat->"id" = $IdsTrusted) do={
           :set Trusted true;
         }
       }

From f1396b83aa7f506fe653184016cd970728eb9407 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Tue, 13 May 2025 09:52:12 +0200
Subject: [PATCH 178/179] telegram-chat: support debug output for updates in
 JSON

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

diff --git a/telegram-chat.rsc b/telegram-chat.rsc
index 50fc0cce..277c40fc 100644
--- a/telegram-chat.rsc
+++ b/telegram-chat.rsc
@@ -33,6 +33,7 @@
   :global GetRandom20CharAlNum;
   :global IfThenElse;
   :global LogPrint;
+  :global LogPrintVerbose;
   :global MAX;
   :global MIN;
   :global MkDir;
@@ -96,6 +97,8 @@
   :local Uptime [ /system/resource/get uptime ];
   :foreach Update in=($JSON->"result") do={
     :set UpdateID ($Update->"update_id");
+    $LogPrintVerbose debug $ScriptName ("Update " . $UpdateID . ": " . [ :serialize to=json $Update ]);
+
     :local Message ($Update->"message");
     :local IsReply ([ :typeof ($Message->"reply_to_message") ] = "string");
     :local IsMyReply ($TelegramMessageIDs->[ :tostr ($Message->"reply_to_message"->"message_id") ]);

From 64fe923c5aea4e6b8cd549a39f8e76c1e9814391 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Tue, 13 May 2025 10:02:03 +0200
Subject: [PATCH 179/179] DEBUG: fix typo

---
 DEBUG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/DEBUG.md b/DEBUG.md
index d5e9beb7..66bf728a 100644
--- a/DEBUG.md
+++ b/DEBUG.md
@@ -42,7 +42,7 @@ Other actions (`disk`, `email`, `remote` or `support`) can be used as
 well. I do not recommend using `echo` - use [debug output](#debug-output)
 instead.
 
-Disable or remote that setting to restore regular logging.
+Disable or remove that setting to restore regular logging.
 
 ## Verbose output