aboutsummaryrefslogtreecommitdiffstats
path: root/collect-wireless-mac.local.rsc
diff options
context:
space:
mode:
authorGravatar Christian Hesse <mail@eworm.de>2024-03-06 23:53:50 +0100
committerGravatar Christian Hesse <mail@eworm.de>2024-03-12 15:27:15 +0100
commit6fd39bd3c5d7c3fe5dca9e92275f60e0b3217f03 (patch)
tree7ced2fbdb536447b537a967e945600ba6dd78c8a /collect-wireless-mac.local.rsc
parentb86d6314868596dacdf422db80ef0ff27c61c644 (diff)
parentf0856c264e07804a229668268a457f2154cb373a (diff)
Merge branch 'do-with-on-error' into nextrouteros-7.15beta4-2
Diffstat (limited to 'collect-wireless-mac.local.rsc')
-rw-r--r--collect-wireless-mac.local.rsc10
1 files changed, 4 insertions, 6 deletions
diff --git a/collect-wireless-mac.local.rsc b/collect-wireless-mac.local.rsc
index f6f898e..a4e81a3 100644
--- a/collect-wireless-mac.local.rsc
+++ b/collect-wireless-mac.local.rsc
@@ -14,8 +14,8 @@
:global GlobalFunctionsReady;
:while ($GlobalFunctionsReady != true) do={ :delay 500ms; }
-:local Main do={
- :local ScriptName [ :tostr $1 ];
+:do {
+ :local ScriptName [ :jobname ];
:global Identity;
@@ -29,7 +29,7 @@
:global SymbolForNotification;
:if ([ $ScriptLock $ScriptName 10 ] = false) do={
- :return false;
+ :error false;
}
:if ([ :len [ /interface/wireless/access-list/find where comment="--- collected above ---" disabled ] ] = 0) do={
@@ -94,6 +94,4 @@
$LogPrintExit2 debug $ScriptName ("No mac address available... Ignoring.") false;
}
}
-}
-
-$Main [ :jobname ];
+} on-error={ }