Merge branch 'empty-array' into next

eworm-de · eworm-de · commit b67b9ec1c17c · 2022-07-13T11:57:47.000+02:00
diff --git a/accesslist-duplicates.capsman b/accesslist-duplicates.capsman
@@ -14,8 +14,8 @@
 
 :global Read;
 
-:local Seen [ :toarray "" ];
-:local Shown [ :toarray "" ];
+:local Seen ({});
+:local Shown ({});
 
 :foreach AccList in=[ /caps-man/access-list/find where mac-address!="00:00:00:00:00:00" ] do={
   :local Mac [ /caps-man/access-list/get $AccList mac-address ];
diff --git a/accesslist-duplicates.local b/accesslist-duplicates.local
@@ -14,8 +14,8 @@
 
 :global Read;
 
-:local Seen [ :toarray "" ];
-:local Shown [ :toarray "" ];
+:local Seen ({});
+:local Shown ({});
 
 :foreach AccList in=[ /interface/wireless/access-list/find where mac-address!="00:00:00:00:00:00" ] do={
   :local Mac [ /interface/wireless/access-list/get $AccList mac-address ];
diff --git a/accesslist-duplicates.template b/accesslist-duplicates.template
@@ -15,8 +15,8 @@
 
 :global Read;
 
-:local Seen [ :toarray "" ];
-:local Shown [ :toarray "" ];
+:local Seen ({});
+:local Shown ({});
 
 :foreach AccList in=[ /%PATH%/access-list/find where mac-address!="00:00:00:00:00:00" ] do={
   :local Mac [ /%PATH%/access-list/get $AccList mac-address ];
diff --git a/backup-email b/backup-email
@@ -50,7 +50,7 @@ $WaitFullyConnected;
 :local FilePath ($0 . "/" . $FileName);
 :local BackupFile "none";
 :local ConfigFile "none";
-:local Attach [ :toarray "" ];
+:local Attach ({});
 
 # binary backup
 :if ($BackupSendBinary = true) do={
diff --git a/check-health b/check-health
@@ -35,10 +35,10 @@
 }
 
 :if ([ :typeof $CheckHealthLast ] != "array") do={
-  :set CheckHealthLast [ :toarray "" ];
+  :set CheckHealthLast ({});
 }
 :if ([ :typeof $CheckHealthTemperatureNotified ] != "array") do={
-  :set CheckHealthTemperatureNotified [ :toarray "" ];
+  :set CheckHealthTemperatureNotified ({});
 }
 
 $ScriptLock $0;
diff --git a/check-lte-firmware-upgrade b/check-lte-firmware-upgrade
@@ -13,7 +13,7 @@
 :global SentLteFirmwareUpgradeNotification;
 
 :if ([ :typeof $SentLteFirmwareUpgradeNotification ] != "array") do={
-  :global SentLteFirmwareUpgradeNotification [ :toarray "" ];
+  :global SentLteFirmwareUpgradeNotification ({});
 }
 
 :local CheckInterface do={
diff --git a/daily-psk.capsman b/daily-psk.capsman
@@ -55,7 +55,7 @@ $WaitFullyConnected;
     ($DailyPskSecrets->2->$WeekDay));
 }
 
-:local Seen [ :toarray "" ];
+:local Seen ({});
 :local Date [ /system/clock/get date ];
 :local NewPsk [ $GeneratePSK $Date ];
 
diff --git a/daily-psk.local b/daily-psk.local
@@ -55,7 +55,7 @@ $WaitFullyConnected;
     ($DailyPskSecrets->2->$WeekDay));
 }
 
-:local Seen [ :toarray "" ];
+:local Seen ({});
 :local Date [ /system/clock/get date ];
 :local NewPsk [ $GeneratePSK $Date ];
 
diff --git a/daily-psk.template b/daily-psk.template
@@ -56,7 +56,7 @@ $WaitFullyConnected;
     ($DailyPskSecrets->2->$WeekDay));
 }
 
-:local Seen [ :toarray "" ];
+:local Seen ({});
 :local Date [ /system/clock/get date ];
 :local NewPsk [ $GeneratePSK $Date ];
 
diff --git a/global-functions b/global-functions
@@ -585,7 +585,7 @@
 
 # prepare NotificationFunctions array
 :if ([ :typeof $NotificationFunctions ] != "array") do={
-  :set NotificationFunctions [ :toarray "" ];
+  :set NotificationFunctions ({});
 }
 
 # send notification via e-mail - expects one array argument
@@ -612,7 +612,7 @@
   }
 
   :if ([ :typeof $EmailQueue ] = "nothing") do={
-      :set EmailQueue [ :toarray "" ];
+      :set EmailQueue ({});
   }
   :local Signature [ /system/note/get note ];
   :set ($EmailQueue->[ :len $EmailQueue ]) {
@@ -634,7 +634,7 @@
   :if ([ :typeof $Source ] != "array") do={
     :set Source [ :tostr $1 ];
   }
-  :local Result [ :toarray "" ];
+  :local Result ({});
   :foreach KeyValue in=[ :toarray $Source ] do={
     :if ([ :find $KeyValue "=" ]) do={
       :set ($Result->[ :pick $KeyValue 0 [ :find $KeyValue "=" ] ]) \
@@ -974,10 +974,10 @@
 
   :global ScriptLockOrder;
   :if ([ :typeof $ScriptLockOrder ] = "nothing") do={
-    :set ScriptLockOrder [ :toarray "" ];
+    :set ScriptLockOrder ({});
   }
   :if ([ :typeof ($ScriptLockOrder->$Script) ] = "nothing") do={
-    :set ($ScriptLockOrder->$Script) [ :toarray "" ];
+    :set ($ScriptLockOrder->$Script) ({});
   }
 
   :local JobCount do={
@@ -1052,7 +1052,7 @@
       }
     }
 
-    :set ($ScriptLockOrder->$Script) [ :toarray "" ];
+    :set ($ScriptLockOrder->$Script) ({});
   }
 
   :if ([ :len [ /system/script/find where name=$Script ] ] = 0) do={
@@ -1065,7 +1065,7 @@
 
   :if ([ $TicketCount $Script ] >= [ $JobCount $Script ]) do={
     $LogPrintExit2 error $0 ("More tickets than running scripts '" . $Script . "', resetting!") false;
-    :set ($ScriptLockOrder->$Script) [ :toarray "" ];
+    :set ($ScriptLockOrder->$Script) ({});
     /system/script/job/remove [ find where script=$Script ];
   }
 
diff --git a/lease-script b/lease-script
@@ -31,7 +31,7 @@ $ScriptLock $0 false 10;
   $LogPrintExit2 debug $0 ("More invocations are waiting, exiting early.") true;
 }
 
-:local RunOrder [ :toarray "" ];
+:local RunOrder ({});
 
 :foreach Script in=[ /system/script/find where source~("\n# provides: lease-script, ") ] do={
   :local Name [ /system/script/get $Script name ];
diff --git a/log-forward b/log-forward
@@ -46,7 +46,7 @@ $ScriptLock $0;
 :local Messages "";
 :local Warning false;
 :local MessageVal;
-:local MessageDups [ :toarray "" ];
+:local MessageDups ({});
 
 :local LogForwardFilterLogForwarding ("^Error sending e-mail <(" . \
     [ $EscapeForRegEx [ $QuotedPrintable ("[" . $Identity . "] " . \
diff --git a/mod/bridge-port-to b/mod/bridge-port-to
@@ -15,7 +15,7 @@
   :global LogPrintExit2;
   :global ParseKeyValueStore;
 
-  :local InterfaceReEnable [ :toarray "" ];
+  :local InterfaceReEnable ({});
   :foreach BridgePort in=[ /interface/bridge/port/find where !(comment=[]) ] do={
     :local BridgePortVal [ /interface/bridge/port/get $BridgePort ];
     :foreach Config,BridgeDefault in=[ $ParseKeyValueStore ($BridgePortVal->"comment") ] do={
diff --git a/mod/bridge-port-vlan b/mod/bridge-port-vlan
@@ -15,7 +15,7 @@
   :global LogPrintExit2;
   :global ParseKeyValueStore;
 
-  :local InterfaceReEnable [ :toarray "" ];
+  :local InterfaceReEnable ({});
   :foreach BridgePort in=[ /interface/bridge/port/find where !(comment=[]) ] do={
     :local BridgePortVal [ /interface/bridge/port/get $BridgePort ];
     :foreach Config,Vlan in=[ $ParseKeyValueStore ($BridgePortVal->"comment") ] do={
diff --git a/mod/notification-matrix b/mod/notification-matrix
@@ -129,7 +129,7 @@
     $LogPrintExit2 info $0 ("Failed sending Matrix notification! Queuing...") false;
 
     :if ([ :typeof $MatrixQueue ] = "nothing") do={
-      :set MatrixQueue [ :toarray "" ];
+      :set MatrixQueue ({});
     }
     :local Text ([ $SymbolForNotification "alarm-clock" ] . \
       "This message was queued since " . [ /system/clock/get date ] . \
diff --git a/mod/notification-telegram b/mod/notification-telegram
@@ -139,7 +139,7 @@
     $LogPrintExit2 info $0 ("Failed sending telegram notification! Queuing...") false;
 
     :if ([ :typeof $TelegramQueue ] = "nothing") do={
-      :set TelegramQueue [ :toarray "" ];
+      :set TelegramQueue ({});
     }
     :set Text ($Text . [ $UrlEncode ("\n" . [ $SymbolForNotification "alarm-clock" ] . \
       [ $EscapeMD ("This message was queued since " . [ /system/clock/get date ] . \
diff --git a/netwatch-dns b/netwatch-dns
@@ -21,8 +21,8 @@ $ScriptLock $0;
   $LogPrintExit2 info $0 ("System just booted, giving netwatch some time to settle.") true;
 }
 
-:local DnsServers [ :toarray "" ];
-:local DnsFallback [ :toarray "" ];
+:local DnsServers ({});
+:local DnsFallback ({});
 :local DnsCurrent [ /ip/dns/get servers ];
 
 :foreach Host in=[ /tool/netwatch/find where comment~"dns" !disabled ] do={
diff --git a/netwatch-notify b/netwatch-notify
@@ -56,7 +56,7 @@ $ScriptLock $0;
 }
 
 :if ([ :typeof $NetwatchNotify ] = "nothing") do={
-  :set NetwatchNotify [ :toarray "" ];
+  :set NetwatchNotify ({});
 }
 
 :foreach Host in=[ /tool/netwatch/find where comment~"notify" !disabled ] do={
diff --git a/sms-forward b/sms-forward
@@ -33,7 +33,7 @@ $WaitFullyConnected;
 :while ([ :len [ /tool/sms/inbox/find ] ] > 0) do={
   :local Phone [ /tool/sms/inbox/get ([ find ]->0) phone ];
   :local Messages "";
-  :local Delete [ :toarray "" ];
+  :local Delete ({});
 
   :foreach Sms in=[ /tool/sms/inbox/find where phone=$Phone ] do={
     :local SmsVal [ /tool/sms/inbox/get $Sms ];

Original file line number	Diff line number	Diff line change
`@@ -35,10 +35,10 @@`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`:if ([ :typeof $CheckHealthLast ] != "array") do={`
`38`		`- :set CheckHealthLast [ :toarray "" ];`
	`38`	`+ :set CheckHealthLast ({});`
`39`	`39`	`}`
`40`	`40`	`:if ([ :typeof $CheckHealthTemperatureNotified ] != "array") do={`
`41`		`- :set CheckHealthTemperatureNotified [ :toarray "" ];`
	`41`	`+ :set CheckHealthTemperatureNotified ({});`
`42`	`42`	`}`
`43`	`43`
`44`	`44`	`$ScriptLock $0;`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@`
`13`	`13`	`:global SentLteFirmwareUpgradeNotification;`
`14`	`14`
`15`	`15`	`:if ([ :typeof $SentLteFirmwareUpgradeNotification ] != "array") do={`
`16`		`- :global SentLteFirmwareUpgradeNotification [ :toarray "" ];`
	`16`	`+ :global SentLteFirmwareUpgradeNotification ({});`
`17`	`17`	`}`
`18`	`18`
`19`	`19`	`:local CheckInterface do={`
Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ $WaitFullyConnected;`
`55`	`55`	`($DailyPskSecrets->2->$WeekDay));`
`56`	`56`	`}`
`57`	`57`
`58`		`-:local Seen [ :toarray "" ];`
	`58`	`+:local Seen ({});`
`59`	`59`	`:local Date [ /system/clock/get date ];`
`60`	`60`	`:local NewPsk [ $GeneratePSK $Date ];`
`61`	`61`
Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ $WaitFullyConnected;`
`56`	`56`	`($DailyPskSecrets->2->$WeekDay));`
`57`	`57`	`}`
`58`	`58`
`59`		`-:local Seen [ :toarray "" ];`
	`59`	`+:local Seen ({});`
`60`	`60`	`:local Date [ /system/clock/get date ];`
`61`	`61`	`:local NewPsk [ $GeneratePSK $Date ];`
`62`	`62`
Original file line number	Diff line number	Diff line change
`@@ -585,7 +585,7 @@`
`585`	`585`
`586`	`586`	`# prepare NotificationFunctions array`
`587`	`587`	`:if ([ :typeof $NotificationFunctions ] != "array") do={`
`588`		`- :set NotificationFunctions [ :toarray "" ];`
	`588`	`+ :set NotificationFunctions ({});`
`589`	`589`	`}`
`590`	`590`
`591`	`591`	`# send notification via e-mail - expects one array argument`
`@@ -612,7 +612,7 @@`
`612`	`612`	`}`
`613`	`613`
`614`	`614`	`:if ([ :typeof $EmailQueue ] = "nothing") do={`
`615`		`- :set EmailQueue [ :toarray "" ];`
	`615`	`+ :set EmailQueue ({});`
`616`	`616`	`}`
`617`	`617`	`:local Signature [ /system/note/get note ];`
`618`	`618`	`:set ($EmailQueue->[ :len $EmailQueue ]) {`
`@@ -634,7 +634,7 @@`
`634`	`634`	`:if ([ :typeof $Source ] != "array") do={`
`635`	`635`	`:set Source [ :tostr $1 ];`
`636`	`636`	`}`
`637`		`- :local Result [ :toarray "" ];`
	`637`	`+ :local Result ({});`
`638`	`638`	`:foreach KeyValue in=[ :toarray $Source ] do={`
`639`	`639`	`:if ([ :find $KeyValue "=" ]) do={`
`640`	`640`	`:set ($Result->[ :pick $KeyValue 0 [ :find $KeyValue "=" ] ]) \`
`@@ -974,10 +974,10 @@`
`974`	`974`
`975`	`975`	`:global ScriptLockOrder;`
`976`	`976`	`:if ([ :typeof $ScriptLockOrder ] = "nothing") do={`
`977`		`- :set ScriptLockOrder [ :toarray "" ];`
	`977`	`+ :set ScriptLockOrder ({});`
`978`	`978`	`}`
`979`	`979`	`:if ([ :typeof ($ScriptLockOrder->$Script) ] = "nothing") do={`
`980`		`- :set ($ScriptLockOrder->$Script) [ :toarray "" ];`
	`980`	`+ :set ($ScriptLockOrder->$Script) ({});`
`981`	`981`	`}`
`982`	`982`
`983`	`983`	`:local JobCount do={`
`@@ -1052,7 +1052,7 @@`
`1052`	`1052`	`}`
`1053`	`1053`	`}`
`1054`	`1054`
`1055`		`- :set ($ScriptLockOrder->$Script) [ :toarray "" ];`
	`1055`	`+ :set ($ScriptLockOrder->$Script) ({});`
`1056`	`1056`	`}`
`1057`	`1057`
`1058`	`1058`	`:if ([ :len [ /system/script/find where name=$Script ] ] = 0) do={`
`@@ -1065,7 +1065,7 @@`
`1065`	`1065`
`1066`	`1066`	`:if ([ $TicketCount $Script ] >= [ $JobCount $Script ]) do={`
`1067`	`1067`	`$LogPrintExit2 error $0 ("More tickets than running scripts '" . $Script . "', resetting!") false;`
`1068`		`- :set ($ScriptLockOrder->$Script) [ :toarray "" ];`
	`1068`	`+ :set ($ScriptLockOrder->$Script) ({});`
`1069`	`1069`	`/system/script/job/remove [ find where script=$Script ];`
`1070`	`1070`	`}`
`1071`	`1071`