accesslist-duplicates: move code into function

5 files changed, 92 insertions, 67 deletions

diff --git a/accesslist-duplicates.capsman.rsc b/accesslist-duplicates.capsman.rsc
index a20c05d..f781eb3 100644
--- a/accesslist-duplicates.capsman.rsc
+++ b/accesslist-duplicates.capsman.rsc
@@ -10,22 +10,27 @@
 #
 # !! Do not edit this file, it is generated from template!
 
-:local 0 [ :jobname ];
 :global GlobalFunctionsReady;
 :while ($GlobalFunctionsReady != true) do={ :delay 500ms; }
 
-:local Seen ({});
+:local Main do={
+  :local ScriptName [ :tostr $1 ];
 
-: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 ];
-  :if ($Seen->$Mac = 1) do={
-    /caps-man/access-list/print where mac-address=$Mac;
-    :local Remove [ :tonum [ /terminal/ask prompt="\nNumeric id to remove, any key to skip!" ] ];
+  :local Seen ({});
 
-    :if ([ :typeof $Remove ] = "num") do={
-      :put ("Removing numeric id " . $Remove . "...\n");
-      /caps-man/access-list/remove $Remove;
+  :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 ];
+    :if ($Seen->$Mac = 1) do={
+      /caps-man/access-list/print where mac-address=$Mac;
+      :local Remove [ :tonum [ /terminal/ask prompt="\nNumeric id to remove, any key to skip!" ] ];
+
+      :if ([ :typeof $Remove ] = "num") do={
+        :put ("Removing numeric id " . $Remove . "...\n");
+        /caps-man/access-list/remove $Remove;
+      }
     }
+    :set ($Seen->$Mac) 1;
   }
-  :set ($Seen->$Mac) 1;
 }
+
+$Main [ :jobname ];
diff --git a/accesslist-duplicates.local.rsc b/accesslist-duplicates.local.rsc
index 0feb9f7..b235cd1 100644
--- a/accesslist-duplicates.local.rsc
+++ b/accesslist-duplicates.local.rsc
@@ -10,22 +10,27 @@
 #
 # !! Do not edit this file, it is generated from template!
 
-:local 0 [ :jobname ];
 :global GlobalFunctionsReady;
 :while ($GlobalFunctionsReady != true) do={ :delay 500ms; }
 
-:local Seen ({});
+:local Main do={
+  :local ScriptName [ :tostr $1 ];
 
-: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 ];
-  :if ($Seen->$Mac = 1) do={
-    /interface/wireless/access-list/print where mac-address=$Mac;
-    :local Remove [ :tonum [ /terminal/ask prompt="\nNumeric id to remove, any key to skip!" ] ];
+  :local Seen ({});
 
-    :if ([ :typeof $Remove ] = "num") do={
-      :put ("Removing numeric id " . $Remove . "...\n");
-      /interface/wireless/access-list/remove $Remove;
+  :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 ];
+    :if ($Seen->$Mac = 1) do={
+      /interface/wireless/access-list/print where mac-address=$Mac;
+      :local Remove [ :tonum [ /terminal/ask prompt="\nNumeric id to remove, any key to skip!" ] ];
+
+      :if ([ :typeof $Remove ] = "num") do={
+        :put ("Removing numeric id " . $Remove . "...\n");
+        /interface/wireless/access-list/remove $Remove;
+      }
     }
+    :set ($Seen->$Mac) 1;
   }
-  :set ($Seen->$Mac) 1;
 }
+
+$Main [ :jobname ];
diff --git a/accesslist-duplicates.template.rsc b/accesslist-duplicates.template.rsc
index f350d0c..97f6138 100644
--- a/accesslist-duplicates.template.rsc
+++ b/accesslist-duplicates.template.rsc
@@ -11,34 +11,39 @@
 # !! This is just a template to generate the real script!
 # !! Pattern '%TEMPL%' is replaced, paths are filtered.
 
-:local 0 [ :jobname ];
 :global GlobalFunctionsReady;
 :while ($GlobalFunctionsReady != true) do={ :delay 500ms; }
 
-:local Seen ({});
+:local Main do={
+  :local ScriptName [ :tostr $1 ];
 
-:foreach AccList in=[ /caps-man/access-list/find where mac-address!="00:00:00:00:00:00" ] do={
-:foreach AccList in=[ /interface/wifi/access-list/find where mac-address!="00:00:00:00:00:00" ] do={
-:foreach AccList in=[ /interface/wifiwave2/access-list/find where mac-address!="00:00:00:00:00:00" ] do={
-:foreach AccList in=[ /interface/wireless/access-list/find where mac-address!="00:00:00:00:00:00" ] do={
-  :local Mac [ /caps-man/access-list/get $AccList mac-address ];
-  :local Mac [ /interface/wifi/access-list/get $AccList mac-address ];
-  :local Mac [ /interface/wifiwave2/access-list/get $AccList mac-address ];
-  :local Mac [ /interface/wireless/access-list/get $AccList mac-address ];
-  :if ($Seen->$Mac = 1) do={
-    /caps-man/access-list/print where mac-address=$Mac;
-    /interface/wifi/access-list/print where mac-address=$Mac;
-    /interface/wifiwave2/access-list/print where mac-address=$Mac;
-    /interface/wireless/access-list/print where mac-address=$Mac;
-    :local Remove [ :tonum [ /terminal/ask prompt="\nNumeric id to remove, any key to skip!" ] ];
+  :local Seen ({});
 
-    :if ([ :typeof $Remove ] = "num") do={
-      :put ("Removing numeric id " . $Remove . "...\n");
-      /caps-man/access-list/remove $Remove;
-      /interface/wifi/access-list/remove $Remove;
-      /interface/wifiwave2/access-list/remove $Remove;
-      /interface/wireless/access-list/remove $Remove;
+  :foreach AccList in=[ /caps-man/access-list/find where mac-address!="00:00:00:00:00:00" ] do={
+  :foreach AccList in=[ /interface/wifi/access-list/find where mac-address!="00:00:00:00:00:00" ] do={
+  :foreach AccList in=[ /interface/wifiwave2/access-list/find where mac-address!="00:00:00:00:00:00" ] do={
+  :foreach AccList in=[ /interface/wireless/access-list/find where mac-address!="00:00:00:00:00:00" ] do={
+    :local Mac [ /caps-man/access-list/get $AccList mac-address ];
+    :local Mac [ /interface/wifi/access-list/get $AccList mac-address ];
+    :local Mac [ /interface/wifiwave2/access-list/get $AccList mac-address ];
+    :local Mac [ /interface/wireless/access-list/get $AccList mac-address ];
+    :if ($Seen->$Mac = 1) do={
+      /caps-man/access-list/print where mac-address=$Mac;
+      /interface/wifi/access-list/print where mac-address=$Mac;
+      /interface/wifiwave2/access-list/print where mac-address=$Mac;
+      /interface/wireless/access-list/print where mac-address=$Mac;
+      :local Remove [ :tonum [ /terminal/ask prompt="\nNumeric id to remove, any key to skip!" ] ];
+
+      :if ([ :typeof $Remove ] = "num") do={
+        :put ("Removing numeric id " . $Remove . "...\n");
+        /caps-man/access-list/remove $Remove;
+        /interface/wifi/access-list/remove $Remove;
+        /interface/wifiwave2/access-list/remove $Remove;
+        /interface/wireless/access-list/remove $Remove;
+      }
     }
+    :set ($Seen->$Mac) 1;
   }
-  :set ($Seen->$Mac) 1;
 }
+
+$Main [ :jobname ];
diff --git a/accesslist-duplicates.wifi.rsc b/accesslist-duplicates.wifi.rsc
index d5f13f0..04ac19c 100644
--- a/accesslist-duplicates.wifi.rsc
+++ b/accesslist-duplicates.wifi.rsc
@@ -10,22 +10,27 @@
 #
 # !! Do not edit this file, it is generated from template!
 
-:local 0 [ :jobname ];
 :global GlobalFunctionsReady;
 :while ($GlobalFunctionsReady != true) do={ :delay 500ms; }
 
-:local Seen ({});
+:local Main do={
+  :local ScriptName [ :tostr $1 ];
 
-:foreach AccList in=[ /interface/wifi/access-list/find where mac-address!="00:00:00:00:00:00" ] do={
-  :local Mac [ /interface/wifi/access-list/get $AccList mac-address ];
-  :if ($Seen->$Mac = 1) do={
-    /interface/wifi/access-list/print where mac-address=$Mac;
-    :local Remove [ :tonum [ /terminal/ask prompt="\nNumeric id to remove, any key to skip!" ] ];
+  :local Seen ({});
 
-    :if ([ :typeof $Remove ] = "num") do={
-      :put ("Removing numeric id " . $Remove . "...\n");
-      /interface/wifi/access-list/remove $Remove;
+  :foreach AccList in=[ /interface/wifi/access-list/find where mac-address!="00:00:00:00:00:00" ] do={
+    :local Mac [ /interface/wifi/access-list/get $AccList mac-address ];
+    :if ($Seen->$Mac = 1) do={
+      /interface/wifi/access-list/print where mac-address=$Mac;
+      :local Remove [ :tonum [ /terminal/ask prompt="\nNumeric id to remove, any key to skip!" ] ];
+
+      :if ([ :typeof $Remove ] = "num") do={
+        :put ("Removing numeric id " . $Remove . "...\n");
+        /interface/wifi/access-list/remove $Remove;
+      }
     }
+    :set ($Seen->$Mac) 1;
   }
-  :set ($Seen->$Mac) 1;
 }
+
+$Main [ :jobname ];
diff --git a/accesslist-duplicates.wifiwave2.rsc b/accesslist-duplicates.wifiwave2.rsc
index 24f5967..232d941 100644
--- a/accesslist-duplicates.wifiwave2.rsc
+++ b/accesslist-duplicates.wifiwave2.rsc
@@ -10,22 +10,27 @@
 #
 # !! Do not edit this file, it is generated from template!
 
-:local 0 [ :jobname ];
 :global GlobalFunctionsReady;
 :while ($GlobalFunctionsReady != true) do={ :delay 500ms; }
 
-:local Seen ({});
+:local Main do={
+  :local ScriptName [ :tostr $1 ];
 
-:foreach AccList in=[ /interface/wifiwave2/access-list/find where mac-address!="00:00:00:00:00:00" ] do={
-  :local Mac [ /interface/wifiwave2/access-list/get $AccList mac-address ];
-  :if ($Seen->$Mac = 1) do={
-    /interface/wifiwave2/access-list/print where mac-address=$Mac;
-    :local Remove [ :tonum [ /terminal/ask prompt="\nNumeric id to remove, any key to skip!" ] ];
+  :local Seen ({});
 
-    :if ([ :typeof $Remove ] = "num") do={
-      :put ("Removing numeric id " . $Remove . "...\n");
-      /interface/wifiwave2/access-list/remove $Remove;
+  :foreach AccList in=[ /interface/wifiwave2/access-list/find where mac-address!="00:00:00:00:00:00" ] do={
+    :local Mac [ /interface/wifiwave2/access-list/get $AccList mac-address ];
+    :if ($Seen->$Mac = 1) do={
+      /interface/wifiwave2/access-list/print where mac-address=$Mac;
+      :local Remove [ :tonum [ /terminal/ask prompt="\nNumeric id to remove, any key to skip!" ] ];
+
+      :if ([ :typeof $Remove ] = "num") do={
+        :put ("Removing numeric id " . $Remove . "...\n");
+        /interface/wifiwave2/access-list/remove $Remove;
+      }
     }
+    :set ($Seen->$Mac) 1;
   }
-  :set ($Seen->$Mac) 1;
 }
+
+$Main [ :jobname ];