Merge branch 'ros-v7-path-syntax' into next

1 files changed, 14 insertions, 14 deletions

diff --git a/collect-wireless-mac.capsman b/collect-wireless-mac.capsman
index 326aa14..9e502e3 100644
--- a/collect-wireless-mac.capsman
+++ b/collect-wireless-mac.capsman
@@ -25,47 +25,47 @@
 
 $ScriptLock $0 false 10;
 
-:if ([ :len [ / caps-man access-list find where comment="--- collected above ---" disabled ] ] = 0) do={
-  / caps-man access-list add comment="--- collected above ---" disabled=yes;
+:if ([ :len [ /caps-man/access-list/find where comment="--- collected above ---" disabled ] ] = 0) do={
+  /caps-man/access-list/add comment="--- collected above ---" disabled=yes;
   $LogPrintExit2 warning $0 ("Added disabled access-list entry with comment '--- collected above ---'.") false;
 }
-:local PlaceBefore ([ / caps-man access-list find where comment="--- collected above ---" disabled ]->0);
+:local PlaceBefore ([ /caps-man/access-list/find where comment="--- collected above ---" disabled ]->0);
 
-:foreach Reg in=[ / caps-man registration-table find ] do={
+:foreach Reg in=[ /caps-man/registration-table/find ] do={
   :local RegVal;
   :do {
-    :set RegVal [ / caps-man registration-table get $Reg ];
+    :set RegVal [ /caps-man/registration-table/get $Reg ];
   } on-error={
     $LogPrintExit2 debug $0 ("Device already gone... Ignoring.") false;
   }
 
   :if ([ :len ($RegVal->"mac-address") ] > 0) do={
-    :local AccessList ([ / caps-man access-list find where mac-address=($RegVal->"mac-address") ]->0);
+    :local AccessList ([ /caps-man/access-list/find where mac-address=($RegVal->"mac-address") ]->0);
     :if ([ :len $AccessList ] > 0) do={
       $LogPrintExit2 debug $0 ("MAC address " . $RegVal->"mac-address" . " already known: " . \
-        [ / caps-man access-list get $AccessList comment ]) false;
+        [ /caps-man/access-list/get $AccessList comment ]) false;
     }
 
     :if ([ :len $AccessList ] = 0) do={
       :local Address "no dhcp lease";
       :local DnsName "no dhcp lease";
       :local HostName "no dhcp lease";
-      :local Lease ([ / ip dhcp-server lease find where mac-address=($RegVal->"mac-address") dynamic=yes status=bound ]->0);
+      :local Lease ([ /ip/dhcp-server/lease/find where mac-address=($RegVal->"mac-address") dynamic=yes status=bound ]->0);
       :if ([ :len $Lease ] > 0) do={
-        :set Address [ / ip dhcp-server lease get $Lease address ];
-        :set HostName [ $EitherOr [ / ip dhcp-server lease get $Lease host-name ] "no hostname" ];
+        :set Address [ /ip/dhcp-server/lease/get $Lease address ];
+        :set HostName [ $EitherOr [ /ip/dhcp-server/lease/get $Lease host-name ] "no hostname" ];
         :set DnsName "no dns name";
-        :local DnsRec ([ / ip dns static find where address=$Address ]->0);
+        :local DnsRec ([ /ip/dns/static/find where address=$Address ]->0);
         :if ([ :len $DnsRec ] > 0) do={
-          :set DnsName [ / ip dns static get $DnsRec name ];
+          :set DnsName [ /ip/dns/static/get $DnsRec name ];
         }
       }
-      :local DateTime ([ / system clock get date ] . " " . [ / system clock get time ]);
+      :local DateTime ([ /system/clock/get date ] . " " . [ /system/clock/get time ]);
       :local Vendor [ $GetMacVendor ($RegVal->"mac-address") ];
       :local Message ("MAC address " . $RegVal->"mac-address" . " (" . $Vendor . ", " . $HostName . ") " . \
         "first seen on " . $DateTime . " connected to SSID " . $RegVal->"ssid" . ", interface " . $RegVal->"interface");
       $LogPrintExit2 info $0 $Message false;
-      / caps-man access-list add place-before=$PlaceBefore comment=$Message mac-address=($RegVal->"mac-address") disabled=yes;
+      /caps-man/access-list/add place-before=$PlaceBefore comment=$Message mac-address=($RegVal->"mac-address") disabled=yes;
       $SendNotification2 ({ origin=$0; \
         subject=([ $SymbolForNotification "mobile-phone" ] . $RegVal->"mac-address" . " connected to " . $RegVal->"ssid"); \
         message=("A device with unknown MAC address connected to " . $RegVal->"ssid" . " on " . $Identity . ".\n\n" . \