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

1 files changed, 18 insertions, 18 deletions

diff --git a/hotspot-to-wpa b/hotspot-to-wpa
index 628d748..add2893 100644
--- a/hotspot-to-wpa
+++ b/hotspot-to-wpa
@@ -16,23 +16,23 @@
 
 :local MacAddress $"mac-address";
 :local UserName $username;
-:local Date [ / system clock get date ];
-:local UserVal [ / ip hotspot user get [ find where name=$UserName ] ];
+:local Date [ /system/clock/get date ];
+:local UserVal [ /ip/hotspot/user/get [ find where name=$UserName ] ];
 :local UserInfo [ $ParseKeyValueStore ($UserVal->"comment") ];
-:local Hotspot [ / ip hotspot host get [ find where mac-address=$MacAddress authorized ] server ];
+:local Hotspot [ /ip/hotspot/host/get [ find where mac-address=$MacAddress authorized ] server ];
 
-:if ([ :len [ / caps-man access-list find where comment="--- hotspot-to-wpa above ---" disabled ] ] = 0) do={
-  / caps-man access-list add comment="--- hotspot-to-wpa above ---" disabled=yes;
+:if ([ :len [ /caps-man/access-list/find where comment="--- hotspot-to-wpa above ---" disabled ] ] = 0) do={
+  /caps-man/access-list/add comment="--- hotspot-to-wpa above ---" disabled=yes;
   $LogPrintExit2 warning $0 ("Added disabled access-list entry with comment '--- hotspot-to-wpa above ---'.") false;
 }
-:local PlaceBefore ([ / caps-man access-list find where comment="--- hotspot-to-wpa above ---" disabled ]->0);
+:local PlaceBefore ([ /caps-man/access-list/find where comment="--- hotspot-to-wpa above ---" disabled ]->0);
 
-:if ([ :len [ / caps-man access-list find where \
+:if ([ :len [ /caps-man/access-list/find where \
     comment=("hotspot-to-wpa template " . $Hotspot) disabled ] ] = 0) do={
-  / caps-man access-list add comment=("hotspot-to-wpa template " . $Hotspot) disabled=yes place-before=$PlaceBefore;
+  /caps-man/access-list/add comment=("hotspot-to-wpa template " . $Hotspot) disabled=yes place-before=$PlaceBefore;
   $LogPrintExit2 warning $0 ("Added template in access-list for hotspot '" . $Hotspot . "'.") false;
 }
-:local Template [ / caps-man access-list get ([ find where \
+:local Template [ /caps-man/access-list/get ([ find where \
     comment=("hotspot-to-wpa template " . $Hotspot) disabled ]->0) ];
 
 :if ($Template->"action" = "reject") do={
@@ -42,31 +42,31 @@
 # allow login page to load
 :delay 1s;
 
-$LogPrintExit2 info $0 ("Adding/updating accesslist entry for mac address " . $MacAddress . \
+$LogPrintExit2 info $0 ("Adding/updating access-list entry for mac address " . $MacAddress . \
   " (user " . $UserName . ").") false;
-/ caps-man access-list remove [ find where mac-address=$MacAddress comment~"^hotspot-to-wpa: " ];
-/ caps-man access-list add comment=("hotspot-to-wpa: " . $UserName . ", " . $MacAddress . ", " . $Date) \
+/caps-man/access-list/remove [ find where mac-address=$MacAddress comment~"^hotspot-to-wpa: " ];
+/caps-man/access-list/add comment=("hotspot-to-wpa: " . $UserName . ", " . $MacAddress . ", " . $Date) \
     mac-address=$MacAddress private-passphrase=($UserVal->"password") ssid-regexp="-wpa\$" place-before=$PlaceBefore;
 
-:local Entry [ / caps-man access-list find where mac-address=$MacAddress \
+:local Entry [ /caps-man/access-list/find where mac-address=$MacAddress \
     comment=("hotspot-to-wpa: " . $UserName . ", " . $MacAddress . ", " . $Date) ];
 :local PrivatePassphrase [ $EitherOr ($UserInfo->"private-passphrase") ($Template->"private-passphrase") ];
 :if ([ :len $PrivatePassphrase ] > 0) do={
   :if ($PrivatePassphrase = "ignore") do={
-    / caps-man access-list set $Entry !private-passphrase;
+    /caps-man/access-list/set $Entry !private-passphrase;
   } else={
-    / caps-man access-list set $Entry private-passphrase=$PrivatePassphrase;
+    /caps-man/access-list/set $Entry private-passphrase=$PrivatePassphrase;
   }
 }
 :local SsidRegexp [ $EitherOr ($UserInfo->"ssid-regexp") ($Template->"ssid-regexp") ];
 :if ([ :len $SsidRegexp ] > 0) do={
-  / caps-man access-list set $Entry ssid-regexp=$SsidRegexp;
+  /caps-man/access-list/set $Entry ssid-regexp=$SsidRegexp;
 }
 :local VlanId [ $EitherOr ($UserInfo->"vlan-id") ($Template->"vlan-id") ];
 :if ([ :len $VlanId ] > 0) do={
-  / caps-man access-list set $Entry vlan-id=$VlanId;
+  /caps-man/access-list/set $Entry vlan-id=$VlanId;
 }
 :local VlanMode [ $EitherOr ($UserInfo->"vlan-mode") ($Template->"vlan-mode") ];
 :if ([ :len $VlanMode] > 0) do={
-  / caps-man access-list set $Entry vlan-mode=$VlanMode;
+  /caps-man/access-list/set $Entry vlan-mode=$VlanMode;
 }