From 2e422a153fad152bfc0a08291728f10c3acb2219 Mon Sep 17 00:00:00 2001 From: Christian Hesse Date: Mon, 19 Jan 2026 15:29:59 +0100 Subject: [PATCH] global-functions: $ExitError: drop argument $ExitOK... ... as the is no longer required with early exit with :exit. --- accesslist-duplicates.capsman.rsc | 2 +- accesslist-duplicates.local.rsc | 2 +- accesslist-duplicates.template.rsc | 2 +- accesslist-duplicates.wifi.rsc | 2 +- backup-cloud.rsc | 2 +- backup-email.rsc | 2 +- backup-partition.rsc | 2 +- backup-upload.rsc | 2 +- capsman-download-packages.capsman.rsc | 2 +- capsman-download-packages.template.rsc | 2 +- capsman-download-packages.wifi.rsc | 2 +- capsman-rolling-upgrade.capsman.rsc | 2 +- capsman-rolling-upgrade.template.rsc | 2 +- capsman-rolling-upgrade.wifi.rsc | 2 +- certificate-renew-issued.rsc | 2 +- check-certificates.rsc | 2 +- check-health.rsc | 2 +- check-lte-firmware-upgrade.rsc | 2 +- check-perpetual-license.rsc | 2 +- check-routeros-update.rsc | 2 +- collect-wireless-mac.capsman.rsc | 2 +- collect-wireless-mac.local.rsc | 2 +- collect-wireless-mac.template.rsc | 2 +- collect-wireless-mac.wifi.rsc | 2 +- daily-psk.capsman.rsc | 2 +- daily-psk.local.rsc | 2 +- daily-psk.template.rsc | 2 +- daily-psk.wifi.rsc | 2 +- dhcp-lease-comment.capsman.rsc | 2 +- dhcp-lease-comment.local.rsc | 2 +- dhcp-lease-comment.template.rsc | 2 +- dhcp-lease-comment.wifi.rsc | 2 +- dhcp-to-dns.rsc | 2 +- firmware-upgrade-reboot.rsc | 2 +- fw-addr-lists.rsc | 2 +- global-functions.rsc | 17 +++++++---------- gps-track.rsc | 2 +- hotspot-to-wpa-cleanup.capsman.rsc | 2 +- hotspot-to-wpa-cleanup.template.rsc | 2 +- hotspot-to-wpa-cleanup.wifi.rsc | 2 +- hotspot-to-wpa.capsman.rsc | 2 +- hotspot-to-wpa.template.rsc | 2 +- hotspot-to-wpa.wifi.rsc | 2 +- ipsec-to-dns.rsc | 2 +- ipv6-update.rsc | 2 +- lease-script.rsc | 2 +- log-forward.rsc | 2 +- mod/bridge-port-to.rsc | 2 +- mod/bridge-port-vlan.rsc | 2 +- mod/inspectvar.rsc | 2 +- mod/ipcalc.rsc | 2 +- mod/notification-email.rsc | 4 ++-- mod/notification-gotify.rsc | 4 ++-- mod/notification-matrix.rsc | 4 ++-- mod/notification-ntfy.rsc | 4 ++-- mod/notification-telegram.rsc | 6 +++--- mod/scriptrunonce.rsc | 2 +- mod/ssh-keys-import.rsc | 4 ++-- mode-button.rsc | 4 ++-- netwatch-dns.rsc | 2 +- netwatch-notify.rsc | 2 +- ospf-to-leds.rsc | 2 +- packages-update.rsc | 2 +- ppp-on-up.rsc | 2 +- sms-action.rsc | 2 +- sms-forward.rsc | 2 +- telegram-chat.rsc | 2 +- update-gre-address.rsc | 2 +- update-tunnelbroker.rsc | 2 +- 69 files changed, 83 insertions(+), 86 deletions(-) diff --git a/accesslist-duplicates.capsman.rsc b/accesslist-duplicates.capsman.rsc index 5bfa4be5..700d99d7 100644 --- a/accesslist-duplicates.capsman.rsc +++ b/accesslist-duplicates.capsman.rsc @@ -32,5 +32,5 @@ :set ($Seen->$Mac) 1; } } do={ - :global ExitError; $ExitError false [ :jobname ] $Err; + :global ExitError; $ExitError [ :jobname ] $Err; } diff --git a/accesslist-duplicates.local.rsc b/accesslist-duplicates.local.rsc index 90b3d126..0b9d242c 100644 --- a/accesslist-duplicates.local.rsc +++ b/accesslist-duplicates.local.rsc @@ -32,5 +32,5 @@ :set ($Seen->$Mac) 1; } } do={ - :global ExitError; $ExitError false [ :jobname ] $Err; + :global ExitError; $ExitError [ :jobname ] $Err; } diff --git a/accesslist-duplicates.template.rsc b/accesslist-duplicates.template.rsc index 898ed256..bcf3026d 100644 --- a/accesslist-duplicates.template.rsc +++ b/accesslist-duplicates.template.rsc @@ -41,5 +41,5 @@ :set ($Seen->$Mac) 1; } } do={ - :global ExitError; $ExitError false [ :jobname ] $Err; + :global ExitError; $ExitError [ :jobname ] $Err; } diff --git a/accesslist-duplicates.wifi.rsc b/accesslist-duplicates.wifi.rsc index 3bdcf7c3..e201e4f8 100644 --- a/accesslist-duplicates.wifi.rsc +++ b/accesslist-duplicates.wifi.rsc @@ -32,5 +32,5 @@ :set ($Seen->$Mac) 1; } } do={ - :global ExitError; $ExitError false [ :jobname ] $Err; + :global ExitError; $ExitError [ :jobname ] $Err; } diff --git a/backup-cloud.rsc b/backup-cloud.rsc index babf2b9a..d8724a30 100644 --- a/backup-cloud.rsc +++ b/backup-cloud.rsc @@ -96,5 +96,5 @@ } $RmDir "tmpfs/backup-cloud"; } do={ - :global ExitError; $ExitError false [ :jobname ] $Err; + :global ExitError; $ExitError [ :jobname ] $Err; } diff --git a/backup-email.rsc b/backup-email.rsc index b6c26680..7bc0b89e 100644 --- a/backup-email.rsc +++ b/backup-email.rsc @@ -133,5 +133,5 @@ } # do not remove the files here, as the mail is still queued! } do={ - :global ExitError; $ExitError false [ :jobname ] $Err; + :global ExitError; $ExitError [ :jobname ] $Err; } diff --git a/backup-partition.rsc b/backup-partition.rsc index 6f3a84ec..0d1dc1a5 100644 --- a/backup-partition.rsc +++ b/backup-partition.rsc @@ -115,5 +115,5 @@ :exit; } } do={ - :global ExitError; $ExitError false [ :jobname ] $Err; + :global ExitError; $ExitError [ :jobname ] $Err; } diff --git a/backup-upload.rsc b/backup-upload.rsc index 189d9d88..aa9aa320 100644 --- a/backup-upload.rsc +++ b/backup-upload.rsc @@ -169,5 +169,5 @@ } $RmDir $DirName; } do={ - :global ExitError; $ExitError false [ :jobname ] $Err; + :global ExitError; $ExitError [ :jobname ] $Err; } diff --git a/capsman-download-packages.capsman.rsc b/capsman-download-packages.capsman.rsc index be09795d..d0205b80 100644 --- a/capsman-download-packages.capsman.rsc +++ b/capsman-download-packages.capsman.rsc @@ -85,5 +85,5 @@ } } } do={ - :global ExitError; $ExitError false [ :jobname ] $Err; + :global ExitError; $ExitError [ :jobname ] $Err; } diff --git a/capsman-download-packages.template.rsc b/capsman-download-packages.template.rsc index 14a45962..99daae70 100644 --- a/capsman-download-packages.template.rsc +++ b/capsman-download-packages.template.rsc @@ -96,5 +96,5 @@ } } } do={ - :global ExitError; $ExitError false [ :jobname ] $Err; + :global ExitError; $ExitError [ :jobname ] $Err; } diff --git a/capsman-download-packages.wifi.rsc b/capsman-download-packages.wifi.rsc index 6b1da82f..5efc3e9a 100644 --- a/capsman-download-packages.wifi.rsc +++ b/capsman-download-packages.wifi.rsc @@ -87,5 +87,5 @@ } } } do={ - :global ExitError; $ExitError false [ :jobname ] $Err; + :global ExitError; $ExitError [ :jobname ] $Err; } diff --git a/capsman-rolling-upgrade.capsman.rsc b/capsman-rolling-upgrade.capsman.rsc index 08cadf60..a1096016 100644 --- a/capsman-rolling-upgrade.capsman.rsc +++ b/capsman-rolling-upgrade.capsman.rsc @@ -44,5 +44,5 @@ } } } do={ - :global ExitError; $ExitError false [ :jobname ] $Err; + :global ExitError; $ExitError [ :jobname ] $Err; } diff --git a/capsman-rolling-upgrade.template.rsc b/capsman-rolling-upgrade.template.rsc index d10448ed..1b0e2d29 100644 --- a/capsman-rolling-upgrade.template.rsc +++ b/capsman-rolling-upgrade.template.rsc @@ -52,5 +52,5 @@ } } } do={ - :global ExitError; $ExitError false [ :jobname ] $Err; + :global ExitError; $ExitError [ :jobname ] $Err; } diff --git a/capsman-rolling-upgrade.wifi.rsc b/capsman-rolling-upgrade.wifi.rsc index 92541471..d2b62a8f 100644 --- a/capsman-rolling-upgrade.wifi.rsc +++ b/capsman-rolling-upgrade.wifi.rsc @@ -45,5 +45,5 @@ } } } do={ - :global ExitError; $ExitError false [ :jobname ] $Err; + :global ExitError; $ExitError [ :jobname ] $Err; } diff --git a/certificate-renew-issued.rsc b/certificate-renew-issued.rsc index 9c22468d..3ad1bd0e 100644 --- a/certificate-renew-issued.rsc +++ b/certificate-renew-issued.rsc @@ -46,5 +46,5 @@ } } } do={ - :global ExitError; $ExitError false [ :jobname ] $Err; + :global ExitError; $ExitError [ :jobname ] $Err; } diff --git a/check-certificates.rsc b/check-certificates.rsc index ef5679ce..ab4cd904 100644 --- a/check-certificates.rsc +++ b/check-certificates.rsc @@ -248,5 +248,5 @@ } } } do={ - :global ExitError; $ExitError false [ :jobname ] $Err; + :global ExitError; $ExitError [ :jobname ] $Err; } diff --git a/check-health.rsc b/check-health.rsc index 793afd3a..35f70b69 100644 --- a/check-health.rsc +++ b/check-health.rsc @@ -103,5 +103,5 @@ :set CheckHealthPlugins; } do={ - :global ExitError; $ExitError false [ :jobname ] $Err; + :global ExitError; $ExitError [ :jobname ] $Err; } diff --git a/check-lte-firmware-upgrade.rsc b/check-lte-firmware-upgrade.rsc index 7acef442..9292fdfe 100644 --- a/check-lte-firmware-upgrade.rsc +++ b/check-lte-firmware-upgrade.rsc @@ -101,5 +101,5 @@ $CheckInterface $ScriptName $Interface; } } do={ - :global ExitError; $ExitError false [ :jobname ] $Err; + :global ExitError; $ExitError [ :jobname ] $Err; } diff --git a/check-perpetual-license.rsc b/check-perpetual-license.rsc index 849843fd..643c0a00 100644 --- a/check-perpetual-license.rsc +++ b/check-perpetual-license.rsc @@ -69,5 +69,5 @@ :set SentCertificateNotification; } } do={ - :global ExitError; $ExitError false [ :jobname ] $Err; + :global ExitError; $ExitError [ :jobname ] $Err; } diff --git a/check-routeros-update.rsc b/check-routeros-update.rsc index 1fe22770..fb4b0901 100644 --- a/check-routeros-update.rsc +++ b/check-routeros-update.rsc @@ -203,5 +203,5 @@ :set SentRouterosUpdateNotification ($Update->"latest-version"); } } do={ - :global ExitError; $ExitError false [ :jobname ] $Err; + :global ExitError; $ExitError [ :jobname ] $Err; } diff --git a/collect-wireless-mac.capsman.rsc b/collect-wireless-mac.capsman.rsc index 0231edba..144f36cd 100644 --- a/collect-wireless-mac.capsman.rsc +++ b/collect-wireless-mac.capsman.rsc @@ -94,5 +94,5 @@ } } } do={ - :global ExitError; $ExitError false [ :jobname ] $Err; + :global ExitError; $ExitError [ :jobname ] $Err; } diff --git a/collect-wireless-mac.local.rsc b/collect-wireless-mac.local.rsc index a799b418..dca6a89c 100644 --- a/collect-wireless-mac.local.rsc +++ b/collect-wireless-mac.local.rsc @@ -95,5 +95,5 @@ } } } do={ - :global ExitError; $ExitError false [ :jobname ] $Err; + :global ExitError; $ExitError [ :jobname ] $Err; } diff --git a/collect-wireless-mac.template.rsc b/collect-wireless-mac.template.rsc index 2d6eed0c..fe02b6ba 100644 --- a/collect-wireless-mac.template.rsc +++ b/collect-wireless-mac.template.rsc @@ -112,5 +112,5 @@ } } } do={ - :global ExitError; $ExitError false [ :jobname ] $Err; + :global ExitError; $ExitError [ :jobname ] $Err; } diff --git a/collect-wireless-mac.wifi.rsc b/collect-wireless-mac.wifi.rsc index 1636ddcc..fbd8b81a 100644 --- a/collect-wireless-mac.wifi.rsc +++ b/collect-wireless-mac.wifi.rsc @@ -94,5 +94,5 @@ } } } do={ - :global ExitError; $ExitError false [ :jobname ] $Err; + :global ExitError; $ExitError [ :jobname ] $Err; } diff --git a/daily-psk.capsman.rsc b/daily-psk.capsman.rsc index 2892b886..a5e42d89 100644 --- a/daily-psk.capsman.rsc +++ b/daily-psk.capsman.rsc @@ -90,5 +90,5 @@ } } } do={ - :global ExitError; $ExitError false [ :jobname ] $Err; + :global ExitError; $ExitError [ :jobname ] $Err; } diff --git a/daily-psk.local.rsc b/daily-psk.local.rsc index cc7d45d9..62ca9309 100644 --- a/daily-psk.local.rsc +++ b/daily-psk.local.rsc @@ -89,5 +89,5 @@ } } } do={ - :global ExitError; $ExitError false [ :jobname ] $Err; + :global ExitError; $ExitError [ :jobname ] $Err; } diff --git a/daily-psk.template.rsc b/daily-psk.template.rsc index 1b408aae..46dad2b3 100644 --- a/daily-psk.template.rsc +++ b/daily-psk.template.rsc @@ -105,5 +105,5 @@ } } } do={ - :global ExitError; $ExitError false [ :jobname ] $Err; + :global ExitError; $ExitError [ :jobname ] $Err; } diff --git a/daily-psk.wifi.rsc b/daily-psk.wifi.rsc index 0bc54422..74d7aded 100644 --- a/daily-psk.wifi.rsc +++ b/daily-psk.wifi.rsc @@ -90,5 +90,5 @@ } } } do={ - :global ExitError; $ExitError false [ :jobname ] $Err; + :global ExitError; $ExitError [ :jobname ] $Err; } diff --git a/dhcp-lease-comment.capsman.rsc b/dhcp-lease-comment.capsman.rsc index a069e9db..1bf8b9ec 100644 --- a/dhcp-lease-comment.capsman.rsc +++ b/dhcp-lease-comment.capsman.rsc @@ -37,5 +37,5 @@ } } } do={ - :global ExitError; $ExitError false [ :jobname ] $Err; + :global ExitError; $ExitError [ :jobname ] $Err; } diff --git a/dhcp-lease-comment.local.rsc b/dhcp-lease-comment.local.rsc index cffe22b9..da2037b5 100644 --- a/dhcp-lease-comment.local.rsc +++ b/dhcp-lease-comment.local.rsc @@ -37,5 +37,5 @@ } } } do={ - :global ExitError; $ExitError false [ :jobname ] $Err; + :global ExitError; $ExitError [ :jobname ] $Err; } diff --git a/dhcp-lease-comment.template.rsc b/dhcp-lease-comment.template.rsc index 1fe9a4a3..fbb60f1d 100644 --- a/dhcp-lease-comment.template.rsc +++ b/dhcp-lease-comment.template.rsc @@ -42,5 +42,5 @@ } } } do={ - :global ExitError; $ExitError false [ :jobname ] $Err; + :global ExitError; $ExitError [ :jobname ] $Err; } diff --git a/dhcp-lease-comment.wifi.rsc b/dhcp-lease-comment.wifi.rsc index 41239861..358f2112 100644 --- a/dhcp-lease-comment.wifi.rsc +++ b/dhcp-lease-comment.wifi.rsc @@ -37,5 +37,5 @@ } } } do={ - :global ExitError; $ExitError false [ :jobname ] $Err; + :global ExitError; $ExitError [ :jobname ] $Err; } diff --git a/dhcp-to-dns.rsc b/dhcp-to-dns.rsc index 573336b0..d52000be 100644 --- a/dhcp-to-dns.rsc +++ b/dhcp-to-dns.rsc @@ -124,5 +124,5 @@ } } } do={ - :global ExitError; $ExitError false [ :jobname ] $Err; + :global ExitError; $ExitError [ :jobname ] $Err; } diff --git a/firmware-upgrade-reboot.rsc b/firmware-upgrade-reboot.rsc index 10df1a47..cf08cfd2 100644 --- a/firmware-upgrade-reboot.rsc +++ b/firmware-upgrade-reboot.rsc @@ -52,5 +52,5 @@ $LogPrint info $ScriptName ("Firmware upgrade successful, rebooting."); /system/reboot; } do={ - :global ExitError; $ExitError false [ :jobname ] $Err; + :global ExitError; $ExitError [ :jobname ] $Err; } diff --git a/fw-addr-lists.rsc b/fw-addr-lists.rsc index 5f2dd972..e4b9bb11 100644 --- a/fw-addr-lists.rsc +++ b/fw-addr-lists.rsc @@ -230,5 +230,5 @@ " - removed: " . [ $HumanReadableNum $CntRemove 1000 ]); } } do={ - :global ExitError; $ExitError false [ :jobname ] $Err; + :global ExitError; $ExitError [ :jobname ] $Err; } diff --git a/global-functions.rsc b/global-functions.rsc index 2aad406e..c23c5150 100644 --- a/global-functions.rsc +++ b/global-functions.rsc @@ -474,18 +474,15 @@ # simple macro to print error message on unintentional error :set ExitError do={ - :local ExitOK [ :tostr $1 ]; - :local Name [ :tostr $2 ]; - :local Error [ :tostr $3 ]; + :local Name [ :tostr $1 ]; + :local Error [ :tostr $2 ]; :global IfThenElse; :global LogPrint; - :if ($ExitOK = "false") do={ - $LogPrint error $Name ([ $IfThenElse ([ :pick $Name 0 1 ] = "\$") \ - "Function" "Script" ] . " '" . $Name . "' exited with error" . \ - [ $IfThenElse (!($Error ~ "^(|true|false)\$")) (": " . $Error) "." ]); - } + $LogPrint error $Name ([ $IfThenElse ([ :pick $Name 0 1 ] = "\$") \ + "Function" "Script" ] . " '" . $Name . "' exited with error" . \ + [ $IfThenElse (!($Error ~ "^(|true|false)\$")) (": " . $Error) "." ]); } # fetch huge data to file, read in chunks @@ -1503,7 +1500,7 @@ :set GlobalConfigMigration; } } do={ - :global ExitError; $ExitError false $0 $Err; + :global ExitError; $ExitError $0 $Err; } } # lock script against multiple invocation @@ -1649,7 +1646,7 @@ $SendNotification2 ({ origin=$0; subject=$1; message=$2; link=$3; silent=$4 }); } do={ - :global ExitError; $ExitError false $0 $Err; + :global ExitError; $ExitError $0 $Err; } } # send notification via NotificationFunctions - expects one array argument diff --git a/gps-track.rsc b/gps-track.rsc index ed089405..05a5e57a 100644 --- a/gps-track.rsc +++ b/gps-track.rsc @@ -47,5 +47,5 @@ $LogPrint debug $ScriptName ("GPS data not valid."); } } do={ - :global ExitError; $ExitError false [ :jobname ] $Err; + :global ExitError; $ExitError [ :jobname ] $Err; } diff --git a/hotspot-to-wpa-cleanup.capsman.rsc b/hotspot-to-wpa-cleanup.capsman.rsc index 2a988944..c816ac67 100644 --- a/hotspot-to-wpa-cleanup.capsman.rsc +++ b/hotspot-to-wpa-cleanup.capsman.rsc @@ -74,5 +74,5 @@ } } } do={ - :global ExitError; $ExitError false [ :jobname ] $Err; + :global ExitError; $ExitError [ :jobname ] $Err; } diff --git a/hotspot-to-wpa-cleanup.template.rsc b/hotspot-to-wpa-cleanup.template.rsc index 290aee52..d4a82a94 100644 --- a/hotspot-to-wpa-cleanup.template.rsc +++ b/hotspot-to-wpa-cleanup.template.rsc @@ -81,5 +81,5 @@ } } } do={ - :global ExitError; $ExitError false [ :jobname ] $Err; + :global ExitError; $ExitError [ :jobname ] $Err; } diff --git a/hotspot-to-wpa-cleanup.wifi.rsc b/hotspot-to-wpa-cleanup.wifi.rsc index 6ed60e87..1fb3527f 100644 --- a/hotspot-to-wpa-cleanup.wifi.rsc +++ b/hotspot-to-wpa-cleanup.wifi.rsc @@ -74,5 +74,5 @@ } } } do={ - :global ExitError; $ExitError false [ :jobname ] $Err; + :global ExitError; $ExitError [ :jobname ] $Err; } diff --git a/hotspot-to-wpa.capsman.rsc b/hotspot-to-wpa.capsman.rsc index b976c356..103d24e6 100644 --- a/hotspot-to-wpa.capsman.rsc +++ b/hotspot-to-wpa.capsman.rsc @@ -97,5 +97,5 @@ :delay 2s; /caps-man/access-list/set $Entry action=accept; } do={ - :global ExitError; $ExitError false [ :jobname ] $Err; + :global ExitError; $ExitError [ :jobname ] $Err; } diff --git a/hotspot-to-wpa.template.rsc b/hotspot-to-wpa.template.rsc index 6f75a7e6..6746b56f 100644 --- a/hotspot-to-wpa.template.rsc +++ b/hotspot-to-wpa.template.rsc @@ -117,5 +117,5 @@ /caps-man/access-list/set $Entry action=accept; /interface/wifi/access-list/set $Entry action=accept; } do={ - :global ExitError; $ExitError false [ :jobname ] $Err; + :global ExitError; $ExitError [ :jobname ] $Err; } diff --git a/hotspot-to-wpa.wifi.rsc b/hotspot-to-wpa.wifi.rsc index b36cefba..71c3e57e 100644 --- a/hotspot-to-wpa.wifi.rsc +++ b/hotspot-to-wpa.wifi.rsc @@ -94,5 +94,5 @@ :delay 2s; /interface/wifi/access-list/set $Entry action=accept; } do={ - :global ExitError; $ExitError false [ :jobname ] $Err; + :global ExitError; $ExitError [ :jobname ] $Err; } diff --git a/ipsec-to-dns.rsc b/ipsec-to-dns.rsc index 6296da3f..7f42ee98 100644 --- a/ipsec-to-dns.rsc +++ b/ipsec-to-dns.rsc @@ -78,5 +78,5 @@ } } } do={ - :global ExitError; $ExitError false [ :jobname ] $Err; + :global ExitError; $ExitError [ :jobname ] $Err; } diff --git a/ipv6-update.rsc b/ipv6-update.rsc index 7b7cc563..e15935c4 100644 --- a/ipv6-update.rsc +++ b/ipv6-update.rsc @@ -98,5 +98,5 @@ } } } do={ - :global ExitError; $ExitError false [ :jobname ] $Err; + :global ExitError; $ExitError [ :jobname ] $Err; } diff --git a/lease-script.rsc b/lease-script.rsc index af0add7a..431c36d1 100644 --- a/lease-script.rsc +++ b/lease-script.rsc @@ -57,5 +57,5 @@ } } } do={ - :global ExitError; $ExitError false [ :jobname ] $Err; + :global ExitError; $ExitError [ :jobname ] $Err; } diff --git a/log-forward.rsc b/log-forward.rsc index 6ad1d586..97a0bff3 100644 --- a/log-forward.rsc +++ b/log-forward.rsc @@ -108,5 +108,5 @@ :set LogForwardLast $Max; } do={ - :global ExitError; $ExitError false [ :jobname ] $Err; + :global ExitError; $ExitError [ :jobname ] $Err; } diff --git a/mod/bridge-port-to.rsc b/mod/bridge-port-to.rsc index 0c9ceab9..5f8d6b93 100644 --- a/mod/bridge-port-to.rsc +++ b/mod/bridge-port-to.rsc @@ -66,5 +66,5 @@ /interface/ethernet/enable $InterfaceReEnable; } } do={ - :global ExitError; $ExitError false $0 $Err; + :global ExitError; $ExitError $0 $Err; } } diff --git a/mod/bridge-port-vlan.rsc b/mod/bridge-port-vlan.rsc index a4b553f3..51500f3a 100644 --- a/mod/bridge-port-vlan.rsc +++ b/mod/bridge-port-vlan.rsc @@ -75,5 +75,5 @@ /interface/ethernet/enable $InterfaceReEnable; } } do={ - :global ExitError; $ExitError false $0 $Err; + :global ExitError; $ExitError $0 $Err; } } diff --git a/mod/inspectvar.rsc b/mod/inspectvar.rsc index d37fb2f4..977e1f99 100644 --- a/mod/inspectvar.rsc +++ b/mod/inspectvar.rsc @@ -17,7 +17,7 @@ :put [ :tocrlf [ $InspectVarReturn $1 ] ]; } do={ - :global ExitError; $ExitError false $0 $Err; + :global ExitError; $ExitError $0 $Err; } } # inspect variable and return formatted string diff --git a/mod/ipcalc.rsc b/mod/ipcalc.rsc index 41264ee5..20760038 100644 --- a/mod/ipcalc.rsc +++ b/mod/ipcalc.rsc @@ -28,7 +28,7 @@ [ $FormatLine "HostMax" ($Values->"hostmax") ] . "\n" . \ [ $FormatLine "Broadcast" ($Values->"broadcast") ]) ]; } do={ - :global ExitError; $ExitError false $0 $Err; + :global ExitError; $ExitError $0 $Err; } } # calculate and return netmask, network, min host, max host and broadcast diff --git a/mod/notification-email.rsc b/mod/notification-email.rsc index 3f6bd6fc..daf4cdc2 100644 --- a/mod/notification-email.rsc +++ b/mod/notification-email.rsc @@ -131,7 +131,7 @@ /system/scheduler/set interval=(($SchedVal->"run-count") . "m") \ comment="Waiting for retry..." $Scheduler; } do={ - :global ExitError; $ExitError false $0 $Err; + :global ExitError; $ExitError $0 $Err; } } # generate filter for log-forward @@ -259,7 +259,7 @@ $SendEMail2 ({ origin=$0; subject=$1; message=$2; link=$3 }); } do={ - :global ExitError; $ExitError false $0 $Err; + :global ExitError; $ExitError $0 $Err; } } # send notification via e-mail - expects one array argument diff --git a/mod/notification-gotify.rsc b/mod/notification-gotify.rsc index 13b53a26..31786f1d 100644 --- a/mod/notification-gotify.rsc +++ b/mod/notification-gotify.rsc @@ -54,7 +54,7 @@ :set GotifyQueue; } } do={ - :global ExitError; $ExitError false $0 $Err; + :global ExitError; $ExitError $0 $Err; } } # send notification via Gotify - expects one array argument @@ -126,7 +126,7 @@ $SendGotify2 ({ origin=$0; subject=$1; message=$2; link=$3; silent=$4 }); } do={ - :global ExitError; $ExitError false $0 $Err; + :global ExitError; $ExitError $0 $Err; } } # send notification via Gotify - expects one array argument diff --git a/mod/notification-matrix.rsc b/mod/notification-matrix.rsc index 7965b843..f2d7a943 100644 --- a/mod/notification-matrix.rsc +++ b/mod/notification-matrix.rsc @@ -59,7 +59,7 @@ :set MatrixQueue; } } do={ - :global ExitError; $ExitError false $0 $Err; + :global ExitError; $ExitError $0 $Err; } } # send notification via Matrix - expects one array argument @@ -172,7 +172,7 @@ $SendMatrix2 ({ origin=$0; subject=$1; message=$2; link=$3 }); } do={ - :global ExitError; $ExitError false $0 $Err; + :global ExitError; $ExitError $0 $Err; } } # send notification via Matrix - expects one array argument diff --git a/mod/notification-ntfy.rsc b/mod/notification-ntfy.rsc index 98be14bb..d74a3a49 100644 --- a/mod/notification-ntfy.rsc +++ b/mod/notification-ntfy.rsc @@ -53,7 +53,7 @@ :set NtfyQueue; } } do={ - :global ExitError; $ExitError false $0 $Err; + :global ExitError; $ExitError $0 $Err; } } # send notification via ntfy - expects one array argument @@ -148,7 +148,7 @@ $SendNtfy2 ({ origin=$0; subject=$1; message=$2; link=$3; silent=$4 }); } do={ - :global ExitError; $ExitError false $0 $Err; + :global ExitError; $ExitError $0 $Err; } } # send notification via ntfy - expects one array argument diff --git a/mod/notification-telegram.rsc b/mod/notification-telegram.rsc index fa781d94..b6aef486 100644 --- a/mod/notification-telegram.rsc +++ b/mod/notification-telegram.rsc @@ -62,7 +62,7 @@ :set TelegramQueue; } } do={ - :global ExitError; $ExitError false $0 $Err; + :global ExitError; $ExitError $0 $Err; } } # get the chat id @@ -101,7 +101,7 @@ $LogPrint info $0 ("The thread id is: " . ($Message->"message_thread_id")); } } do={ - :global ExitError; $ExitError false $0 $Err; + :global ExitError; $ExitError $0 $Err; } } # send notification via telegram - expects one array argument @@ -237,7 +237,7 @@ $SendTelegram2 ({ origin=$0; subject=$1; message=$2; link=$3; silent=$4 }); } do={ - :global ExitError; $ExitError false $0 $Err; + :global ExitError; $ExitError $0 $Err; } } # send notification via telegram - expects one array argument diff --git a/mod/scriptrunonce.rsc b/mod/scriptrunonce.rsc index 6ffb44a4..5f76eb02 100644 --- a/mod/scriptrunonce.rsc +++ b/mod/scriptrunonce.rsc @@ -52,5 +52,5 @@ :return true; } } do={ - :global ExitError; $ExitError false $0 $Err; + :global ExitError; $ExitError $0 $Err; } } diff --git a/mod/ssh-keys-import.rsc b/mod/ssh-keys-import.rsc index f858a545..36ca9f8a 100644 --- a/mod/ssh-keys-import.rsc +++ b/mod/ssh-keys-import.rsc @@ -67,7 +67,7 @@ :return false; } } do={ - :global ExitError; $ExitError false $0 $Err; + :global ExitError; $ExitError $0 $Err; } } # import keys from a file @@ -109,5 +109,5 @@ } } } do={ - :global ExitError; $ExitError false $0 $Err; + :global ExitError; $ExitError $0 $Err; } } diff --git a/mode-button.rsc b/mode-button.rsc index fa11f19f..f9fb6398 100644 --- a/mode-button.rsc +++ b/mode-button.rsc @@ -82,7 +82,7 @@ $LogPrint info $FuncName ("No action defined for " . $Count . " mode-button presses."); } } do={ - :global ExitError; $ExitError false $0 $Err; + :global ExitError; $ExitError $0 $Err; } } /system/scheduler/add name="_ModeButtonScheduler" \ on-event=":global ModeButtonScheduler; \$ModeButtonScheduler;" interval=3s; @@ -91,5 +91,5 @@ /system/scheduler/set $Scheduler start-time=[ /system/clock/get time ]; } } do={ - :global ExitError; $ExitError false [ :jobname ] $Err; + :global ExitError; $ExitError [ :jobname ] $Err; } diff --git a/netwatch-dns.rsc b/netwatch-dns.rsc index 50c9d57e..98e27dab 100644 --- a/netwatch-dns.rsc +++ b/netwatch-dns.rsc @@ -139,5 +139,5 @@ } } } do={ - :global ExitError; $ExitError false [ :jobname ] $Err; + :global ExitError; $ExitError [ :jobname ] $Err; } diff --git a/netwatch-notify.rsc b/netwatch-notify.rsc index 4ed7e916..0d5402bd 100644 --- a/netwatch-notify.rsc +++ b/netwatch-notify.rsc @@ -223,5 +223,5 @@ } } } do={ - :global ExitError; $ExitError false [ :jobname ] $Err; + :global ExitError; $ExitError [ :jobname ] $Err; } diff --git a/ospf-to-leds.rsc b/ospf-to-leds.rsc index 8b3cb920..14633482 100644 --- a/ospf-to-leds.rsc +++ b/ospf-to-leds.rsc @@ -43,5 +43,5 @@ } } } do={ - :global ExitError; $ExitError false [ :jobname ] $Err; + :global ExitError; $ExitError [ :jobname ] $Err; } diff --git a/packages-update.rsc b/packages-update.rsc index 75a9bfe8..cbce4323 100644 --- a/packages-update.rsc +++ b/packages-update.rsc @@ -164,5 +164,5 @@ :delay 1s; /system/reboot; } do={ - :global ExitError; $ExitError false [ :jobname ] $Err; + :global ExitError; $ExitError [ :jobname ] $Err; } diff --git a/ppp-on-up.rsc b/ppp-on-up.rsc index 0a6af57a..3112e5b8 100644 --- a/ppp-on-up.rsc +++ b/ppp-on-up.rsc @@ -38,5 +38,5 @@ } } } do={ - :global ExitError; $ExitError false [ :jobname ] $Err; + :global ExitError; $ExitError [ :jobname ] $Err; } diff --git a/sms-action.rsc b/sms-action.rsc index 7a19edf7..f0cbede2 100644 --- a/sms-action.rsc +++ b/sms-action.rsc @@ -35,5 +35,5 @@ $LogPrint warning $ScriptName ("The code for action '" . $Action . "' failed syntax validation!"); } } do={ - :global ExitError; $ExitError false [ :jobname ] $Err; + :global ExitError; $ExitError [ :jobname ] $Err; } diff --git a/sms-forward.rsc b/sms-forward.rsc index 68ba94aa..715f9e99 100644 --- a/sms-forward.rsc +++ b/sms-forward.rsc @@ -103,5 +103,5 @@ } } } do={ - :global ExitError; $ExitError false [ :jobname ] $Err; + :global ExitError; $ExitError [ :jobname ] $Err; } diff --git a/telegram-chat.rsc b/telegram-chat.rsc index 8ca27236..698fac52 100644 --- a/telegram-chat.rsc +++ b/telegram-chat.rsc @@ -192,5 +192,5 @@ :set TelegramChatOffset ([ :pick $TelegramChatOffset 1 3 ], \ [ $IfThenElse ($UpdateID >= $TelegramChatOffset->2) ($UpdateID + 1) ($TelegramChatOffset->2) ]); } do={ - :global ExitError; $ExitError false [ :jobname ] $Err; + :global ExitError; $ExitError [ :jobname ] $Err; } diff --git a/update-gre-address.rsc b/update-gre-address.rsc index 50cc0a12..66db847d 100644 --- a/update-gre-address.rsc +++ b/update-gre-address.rsc @@ -40,5 +40,5 @@ } } } do={ - :global ExitError; $ExitError false [ :jobname ] $Err; + :global ExitError; $ExitError [ :jobname ] $Err; } diff --git a/update-tunnelbroker.rsc b/update-tunnelbroker.rsc index c0ce03bc..4fa53abd 100644 --- a/update-tunnelbroker.rsc +++ b/update-tunnelbroker.rsc @@ -66,5 +66,5 @@ } } } do={ - :global ExitError; $ExitError false [ :jobname ] $Err; + :global ExitError; $ExitError [ :jobname ] $Err; }