mirror.MikroTik/eworm.routeros-scripts
1
0
Fork 0
mirror of https://git.eworm.de/cgit/routeros-scripts synced 2025-07-03 06:34:27 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'onerror-for-outer-block' into next

Browse source
This commit is contained in:
Christian Hesse 2025-05-06 10:06:56 +02:00
commit 2afe734bc3
69 changed files with 234 additions and 234 deletions
Download patch file Download diff file Expand all files Collapse all files

6
accesslist-duplicates.capsman.rsc
View file

@ -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;
}

6
accesslist-duplicates.local.rsc
View file

@ -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;
}

6
accesslist-duplicates.template.rsc
View file

@ -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;
}

6
accesslist-duplicates.wifi.rsc
View file

@ -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;
}

6
backup-cloud.rsc
View file

@ -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;
}

6
backup-email.rsc
View file

@ -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;
}

6
backup-partition.rsc
View file

@ -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;
}

6
backup-upload.rsc
View file

@ -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;
}

6
capsman-download-packages.capsman.rsc
View file

@ -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;
}

6
capsman-download-packages.template.rsc
View file

@ -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;
}

6
capsman-download-packages.wifi.rsc
View file

@ -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;
}

6
capsman-rolling-upgrade.capsman.rsc
View file

@ -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;
}

6
capsman-rolling-upgrade.template.rsc
View file

@ -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;
}

6
capsman-rolling-upgrade.wifi.rsc
View file

@ -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;
}

6
certificate-renew-issued.rsc
View file

@ -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;
}

6
check-certificates.rsc
View file

@ -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;
}

6
check-health.rsc
View file

@ -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;
}

6
check-lte-firmware-upgrade.rsc
View file

@ -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;
}

6
check-perpetual-license.rsc
View file

@ -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;
}

6
check-routeros-update.rsc
View file

@ -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;
}

6
collect-wireless-mac.capsman.rsc
View file

@ -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;
}

6
collect-wireless-mac.local.rsc
View file

@ -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;
}

6
collect-wireless-mac.template.rsc
View file

@ -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;
}

6
collect-wireless-mac.wifi.rsc
View file

@ -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;
}

6
daily-psk.capsman.rsc
View file

@ -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;
}

6
daily-psk.local.rsc
View file

@ -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;
}

6
daily-psk.template.rsc
View file

@ -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;
}

6
daily-psk.wifi.rsc
View file

@ -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;
}

6
dhcp-lease-comment.capsman.rsc
View file

@ -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;
}

6
dhcp-lease-comment.local.rsc
View file

@ -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;
}

6
dhcp-lease-comment.template.rsc
View file

@ -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;
}

6
dhcp-lease-comment.wifi.rsc
View file

@ -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;
}

6
dhcp-to-dns.rsc
View file

@ -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;
}

6
firmware-upgrade-reboot.rsc
View file

@ -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;
}

6
fw-addr-lists.rsc
View file

@ -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;
}

12
global-functions.rsc
View file

@ -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

6
gps-track.rsc
View file

@ -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;
}

6
hotspot-to-wpa-cleanup.capsman.rsc
View file

@ -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;
}

6
hotspot-to-wpa-cleanup.template.rsc
View file

@ -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;
}

6
hotspot-to-wpa-cleanup.wifi.rsc
View file

@ -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;
}

6
hotspot-to-wpa.capsman.rsc
View file

@ -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;
}

6
hotspot-to-wpa.template.rsc
View file

@ -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;
}

6
hotspot-to-wpa.wifi.rsc
View file

@ -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;
}

6
ipsec-to-dns.rsc
View file

@ -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;
}

6
ipv6-update.rsc
View file

@ -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;
}

6
lease-script.rsc
View file

@ -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;
}

6
log-forward.rsc
View file

@ -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;
}

6
mod/bridge-port-to.rsc
View file

@ -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;
} }

6
mod/bridge-port-vlan.rsc
View file

@ -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;
} }

6
mod/inspectvar.rsc
View file

@ -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

6
mod/ipcalc.rsc
View file

@ -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

12
mod/notification-email.rsc
View file

@ -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

12
mod/notification-gotify.rsc
View file

@ -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

12
mod/notification-matrix.rsc
View file

@ -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

12
mod/notification-ntfy.rsc
View file

@ -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

18
mod/notification-telegram.rsc
View file

@ -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

6
mod/scriptrunonce.rsc
View file

@ -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;
} }

12
mod/ssh-keys-import.rsc
View file

@ -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;
} }

12
mode-button.rsc
View file

@ -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;
}

6
netwatch-dns.rsc
View file

@ -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;
}

6
netwatch-notify.rsc
View file

@ -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;
}

6
ospf-to-leds.rsc
View file

@ -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;
}

6
packages-update.rsc
View file

@ -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;
}

6
ppp-on-up.rsc
View file

@ -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;
}

6
sms-action.rsc
View file

@ -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;
}

6
sms-forward.rsc
View file

@ -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;
}

6
telegram-chat.rsc
View file

@ -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;
}

6
update-gre-address.rsc
View file

@ -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;
}

6
update-tunnelbroker.rsc
View file

@ -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;
}