capsman-rolling-upgrade: move code into function

4 files changed, 103 insertions, 83 deletions

diff --git a/capsman-rolling-upgrade.capsman.rsc b/capsman-rolling-upgrade.capsman.rsc
index 7aa20aa..fb0904d 100644
--- a/capsman-rolling-upgrade.capsman.rsc
+++ b/capsman-rolling-upgrade.capsman.rsc
@@ -12,30 +12,35 @@
 #
 # !! Do not edit this file, it is generated from template!
 
-:local 0 [ :jobname ];
 :global GlobalFunctionsReady;
 :while ($GlobalFunctionsReady != true) do={ :delay 500ms; }
 
-:global LogPrintExit2;
-:global ScriptLock;
+:local Main do={
+  :local ScriptName [ :tostr $1 ];
 
-$ScriptLock $0;
+  :global LogPrintExit2;
+  :global ScriptLock;
 
-:local InstalledVersion [ /system/package/update/get installed-version ];
+  $ScriptLock $ScriptName;
 
-:local RemoteCapCount [ :len [ /caps-man/remote-cap/find ] ];
-:if ($RemoteCapCount > 0) do={
-  :local Delay (600 / $RemoteCapCount);
-  :if ($Delay > 120) do={ :set Delay 120; }
-  :foreach RemoteCap in=[ /caps-man/remote-cap/find where version!=$InstalledVersion ] do={
-    :local RemoteCapVal [ /caps-man/remote-cap/get $RemoteCap ];
-    :if ([ :len $RemoteCapVal ] > 1) do={
-      $LogPrintExit2 info $0 ("Starting upgrade for " . $RemoteCapVal->"name" . \
-        " (" . $RemoteCapVal->"identity" . ")...") false;
-      /caps-man/remote-cap/upgrade $RemoteCap;
-    } else={
-      $LogPrintExit2 warning $0 ("Remote CAP vanished, skipping upgrade.") false;
+  :local InstalledVersion [ /system/package/update/get installed-version ];
+
+  :local RemoteCapCount [ :len [ /caps-man/remote-cap/find ] ];
+  :if ($RemoteCapCount > 0) do={
+    :local Delay (600 / $RemoteCapCount);
+    :if ($Delay > 120) do={ :set Delay 120; }
+    :foreach RemoteCap in=[ /caps-man/remote-cap/find where version!=$InstalledVersion ] do={
+      :local RemoteCapVal [ /caps-man/remote-cap/get $RemoteCap ];
+      :if ([ :len $RemoteCapVal ] > 1) do={
+        $LogPrintExit2 info $ScriptName ("Starting upgrade for " . $RemoteCapVal->"name" . \
+          " (" . $RemoteCapVal->"identity" . ")...") false;
+        /caps-man/remote-cap/upgrade $RemoteCap;
+      } else={
+        $LogPrintExit2 warning $ScriptName ("Remote CAP vanished, skipping upgrade.") false;
+      }
+      :delay ($Delay . "s");
     }
-    :delay ($Delay . "s");
   }
 }
+
+$Main [ :jobname ];
diff --git a/capsman-rolling-upgrade.template.rsc b/capsman-rolling-upgrade.template.rsc
index de0b4d1..6ea9ac0 100644
--- a/capsman-rolling-upgrade.template.rsc
+++ b/capsman-rolling-upgrade.template.rsc
@@ -13,41 +13,46 @@
 # !! 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; }
 
-:global LogPrintExit2;
-:global ScriptLock;
+:local Main do={
+  :local ScriptName [ :tostr $1 ];
 
-$ScriptLock $0;
+  :global LogPrintExit2;
+  :global ScriptLock;
 
-:local InstalledVersion [ /system/package/update/get installed-version ];
+  $ScriptLock $ScriptName;
 
-:local RemoteCapCount [ :len [ /caps-man/remote-cap/find ] ];
-:local RemoteCapCount [ :len [ /interface/wifi/capsman/remote-cap/find ] ];
-:local RemoteCapCount [ :len [ /interface/wifiwave2/capsman/remote-cap/find ] ];
-:if ($RemoteCapCount > 0) do={
-  :local Delay (600 / $RemoteCapCount);
-  :if ($Delay > 120) do={ :set Delay 120; }
-  :foreach RemoteCap in=[ /caps-man/remote-cap/find where version!=$InstalledVersion ] do={
-  :foreach RemoteCap in=[ /interface/wifi/capsman/remote-cap/find where version!=$InstalledVersion ] do={
-  :foreach RemoteCap in=[ /interface/wifiwave2/capsman/remote-cap/find where version!=$InstalledVersion ] do={
-    :local RemoteCapVal [ /caps-man/remote-cap/get $RemoteCap ];
-    :local RemoteCapVal [ /interface/wifi/capsman/remote-cap/get $RemoteCap ];
-    :local RemoteCapVal [ /interface/wifiwave2/capsman/remote-cap/get $RemoteCap ];
-    :if ([ :len $RemoteCapVal ] > 1) do={
+  :local InstalledVersion [ /system/package/update/get installed-version ];
+
+  :local RemoteCapCount [ :len [ /caps-man/remote-cap/find ] ];
+  :local RemoteCapCount [ :len [ /interface/wifi/capsman/remote-cap/find ] ];
+  :local RemoteCapCount [ :len [ /interface/wifiwave2/capsman/remote-cap/find ] ];
+  :if ($RemoteCapCount > 0) do={
+    :local Delay (600 / $RemoteCapCount);
+    :if ($Delay > 120) do={ :set Delay 120; }
+    :foreach RemoteCap in=[ /caps-man/remote-cap/find where version!=$InstalledVersion ] do={
+    :foreach RemoteCap in=[ /interface/wifi/capsman/remote-cap/find where version!=$InstalledVersion ] do={
+    :foreach RemoteCap in=[ /interface/wifiwave2/capsman/remote-cap/find where version!=$InstalledVersion ] do={
+      :local RemoteCapVal [ /caps-man/remote-cap/get $RemoteCap ];
+      :local RemoteCapVal [ /interface/wifi/capsman/remote-cap/get $RemoteCap ];
+      :local RemoteCapVal [ /interface/wifiwave2/capsman/remote-cap/get $RemoteCap ];
+      :if ([ :len $RemoteCapVal ] > 1) do={
 # NOT /caps-man/ #
-      :set ($RemoteCapVal->"name") ($RemoteCapVal->"common-name");
+        :set ($RemoteCapVal->"name") ($RemoteCapVal->"common-name");
 # NOT /caps-man/ #
-      $LogPrintExit2 info $0 ("Starting upgrade for " . $RemoteCapVal->"name" . \
-        " (" . $RemoteCapVal->"identity" . ")...") false;
-      /caps-man/remote-cap/upgrade $RemoteCap;
-      /interface/wifi/capsman/remote-cap/upgrade $RemoteCap;
-      /interface/wifiwave2/capsman/remote-cap/upgrade $RemoteCap;
-    } else={
-      $LogPrintExit2 warning $0 ("Remote CAP vanished, skipping upgrade.") false;
+        $LogPrintExit2 info $ScriptName ("Starting upgrade for " . $RemoteCapVal->"name" . \
+          " (" . $RemoteCapVal->"identity" . ")...") false;
+        /caps-man/remote-cap/upgrade $RemoteCap;
+        /interface/wifi/capsman/remote-cap/upgrade $RemoteCap;
+        /interface/wifiwave2/capsman/remote-cap/upgrade $RemoteCap;
+      } else={
+        $LogPrintExit2 warning $ScriptName ("Remote CAP vanished, skipping upgrade.") false;
+      }
+      :delay ($Delay . "s");
     }
-    :delay ($Delay . "s");
   }
 }
+
+$Main [ :jobname ];
diff --git a/capsman-rolling-upgrade.wifi.rsc b/capsman-rolling-upgrade.wifi.rsc
index c17c5a1..d788c29 100644
--- a/capsman-rolling-upgrade.wifi.rsc
+++ b/capsman-rolling-upgrade.wifi.rsc
@@ -12,31 +12,36 @@
 #
 # !! Do not edit this file, it is generated from template!
 
-:local 0 [ :jobname ];
 :global GlobalFunctionsReady;
 :while ($GlobalFunctionsReady != true) do={ :delay 500ms; }
 
-:global LogPrintExit2;
-:global ScriptLock;
+:local Main do={
+  :local ScriptName [ :tostr $1 ];
 
-$ScriptLock $0;
+  :global LogPrintExit2;
+  :global ScriptLock;
 
-:local InstalledVersion [ /system/package/update/get installed-version ];
+  $ScriptLock $ScriptName;
 
-:local RemoteCapCount [ :len [ /interface/wifi/capsman/remote-cap/find ] ];
-:if ($RemoteCapCount > 0) do={
-  :local Delay (600 / $RemoteCapCount);
-  :if ($Delay > 120) do={ :set Delay 120; }
-  :foreach RemoteCap in=[ /interface/wifi/capsman/remote-cap/find where version!=$InstalledVersion ] do={
-    :local RemoteCapVal [ /interface/wifi/capsman/remote-cap/get $RemoteCap ];
-    :if ([ :len $RemoteCapVal ] > 1) do={
-      :set ($RemoteCapVal->"name") ($RemoteCapVal->"common-name");
-      $LogPrintExit2 info $0 ("Starting upgrade for " . $RemoteCapVal->"name" . \
-        " (" . $RemoteCapVal->"identity" . ")...") false;
-      /interface/wifi/capsman/remote-cap/upgrade $RemoteCap;
-    } else={
-      $LogPrintExit2 warning $0 ("Remote CAP vanished, skipping upgrade.") false;
+  :local InstalledVersion [ /system/package/update/get installed-version ];
+
+  :local RemoteCapCount [ :len [ /interface/wifi/capsman/remote-cap/find ] ];
+  :if ($RemoteCapCount > 0) do={
+    :local Delay (600 / $RemoteCapCount);
+    :if ($Delay > 120) do={ :set Delay 120; }
+    :foreach RemoteCap in=[ /interface/wifi/capsman/remote-cap/find where version!=$InstalledVersion ] do={
+      :local RemoteCapVal [ /interface/wifi/capsman/remote-cap/get $RemoteCap ];
+      :if ([ :len $RemoteCapVal ] > 1) do={
+        :set ($RemoteCapVal->"name") ($RemoteCapVal->"common-name");
+        $LogPrintExit2 info $ScriptName ("Starting upgrade for " . $RemoteCapVal->"name" . \
+          " (" . $RemoteCapVal->"identity" . ")...") false;
+        /interface/wifi/capsman/remote-cap/upgrade $RemoteCap;
+      } else={
+        $LogPrintExit2 warning $ScriptName ("Remote CAP vanished, skipping upgrade.") false;
+      }
+      :delay ($Delay . "s");
     }
-    :delay ($Delay . "s");
   }
 }
+
+$Main [ :jobname ];
diff --git a/capsman-rolling-upgrade.wifiwave2.rsc b/capsman-rolling-upgrade.wifiwave2.rsc
index aff47e4..78e348d 100644
--- a/capsman-rolling-upgrade.wifiwave2.rsc
+++ b/capsman-rolling-upgrade.wifiwave2.rsc
@@ -12,31 +12,36 @@
 #
 # !! Do not edit this file, it is generated from template!
 
-:local 0 [ :jobname ];
 :global GlobalFunctionsReady;
 :while ($GlobalFunctionsReady != true) do={ :delay 500ms; }
 
-:global LogPrintExit2;
-:global ScriptLock;
+:local Main do={
+  :local ScriptName [ :tostr $1 ];
 
-$ScriptLock $0;
+  :global LogPrintExit2;
+  :global ScriptLock;
 
-:local InstalledVersion [ /system/package/update/get installed-version ];
+  $ScriptLock $ScriptName;
 
-:local RemoteCapCount [ :len [ /interface/wifiwave2/capsman/remote-cap/find ] ];
-:if ($RemoteCapCount > 0) do={
-  :local Delay (600 / $RemoteCapCount);
-  :if ($Delay > 120) do={ :set Delay 120; }
-  :foreach RemoteCap in=[ /interface/wifiwave2/capsman/remote-cap/find where version!=$InstalledVersion ] do={
-    :local RemoteCapVal [ /interface/wifiwave2/capsman/remote-cap/get $RemoteCap ];
-    :if ([ :len $RemoteCapVal ] > 1) do={
-      :set ($RemoteCapVal->"name") ($RemoteCapVal->"common-name");
-      $LogPrintExit2 info $0 ("Starting upgrade for " . $RemoteCapVal->"name" . \
-        " (" . $RemoteCapVal->"identity" . ")...") false;
-      /interface/wifiwave2/capsman/remote-cap/upgrade $RemoteCap;
-    } else={
-      $LogPrintExit2 warning $0 ("Remote CAP vanished, skipping upgrade.") false;
+  :local InstalledVersion [ /system/package/update/get installed-version ];
+
+  :local RemoteCapCount [ :len [ /interface/wifiwave2/capsman/remote-cap/find ] ];
+  :if ($RemoteCapCount > 0) do={
+    :local Delay (600 / $RemoteCapCount);
+    :if ($Delay > 120) do={ :set Delay 120; }
+    :foreach RemoteCap in=[ /interface/wifiwave2/capsman/remote-cap/find where version!=$InstalledVersion ] do={
+      :local RemoteCapVal [ /interface/wifiwave2/capsman/remote-cap/get $RemoteCap ];
+      :if ([ :len $RemoteCapVal ] > 1) do={
+        :set ($RemoteCapVal->"name") ($RemoteCapVal->"common-name");
+        $LogPrintExit2 info $ScriptName ("Starting upgrade for " . $RemoteCapVal->"name" . \
+          " (" . $RemoteCapVal->"identity" . ")...") false;
+        /interface/wifiwave2/capsman/remote-cap/upgrade $RemoteCap;
+      } else={
+        $LogPrintExit2 warning $ScriptName ("Remote CAP vanished, skipping upgrade.") false;
+      }
+      :delay ($Delay . "s");
     }
-    :delay ($Delay . "s");
   }
 }
+
+$Main [ :jobname ];