From c2df671d6f31c0e652542f731d66cbccace43f85 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Mon, 4 Mar 2024 13:48:00 +0100
Subject: capsman-download-packages: move code into function

---
 capsman-download-packages.capsman.rsc   |  95 ++++++++++++++-------------
 capsman-download-packages.template.rsc  | 113 +++++++++++++++++---------------
 capsman-download-packages.wifi.rsc      |  99 +++++++++++++++-------------
 capsman-download-packages.wifiwave2.rsc |  95 ++++++++++++++-------------
 4 files changed, 211 insertions(+), 191 deletions(-)

diff --git a/capsman-download-packages.capsman.rsc b/capsman-download-packages.capsman.rsc
index 82849f8..18ecf57 100644
--- a/capsman-download-packages.capsman.rsc
+++ b/capsman-download-packages.capsman.rsc
@@ -11,66 +11,71 @@
 #
 # !! Do not edit this file, it is generated from template!
 
-:local 0 [ :jobname ];
 :global GlobalFunctionsReady;
 :while ($GlobalFunctionsReady != true) do={ :delay 500ms; }
 
-:global CleanFilePath;
-:global DownloadPackage;
-:global LogPrintExit2;
-:global MkDir;
-:global ScriptLock;
-:global WaitFullyConnected;
+:local Main do={
+  :local ScriptName [ :tostr $1 ];
 
-$ScriptLock $0;
-$WaitFullyConnected;
+  :global CleanFilePath;
+  :global DownloadPackage;
+  :global LogPrintExit2;
+  :global MkDir;
+  :global ScriptLock;
+  :global WaitFullyConnected;
 
-:local PackagePath [ $CleanFilePath [ /caps-man/manager/get package-path ] ];
-:local InstalledVersion [ /system/package/update/get installed-version ];
-:local Updated false;
+  $ScriptLock $ScriptName;
+  $WaitFullyConnected;
 
-:if ([ :len $PackagePath ] = 0) do={
-  $LogPrintExit2 warning $0 ("The CAPsMAN package path is not defined, can not download packages.") true;
-}
+  :local PackagePath [ $CleanFilePath [ /caps-man/manager/get package-path ] ];
+  :local InstalledVersion [ /system/package/update/get installed-version ];
+  :local Updated false;
 
-:if ([ :len [ /file/find where name=$PackagePath type="directory" ] ] = 0) do={
-  :if ([ $MkDir $PackagePath ] = false) do={
-    $LogPrintExit2 warning $0 ("Creating directory at CAPsMAN package path (" . \
-      $PackagePath . ") failed!") true;
+  :if ([ :len $PackagePath ] = 0) do={
+    $LogPrintExit2 warning $ScriptName ("The CAPsMAN package path is not defined, can not download packages.") true;
   }
-  $LogPrintExit2 info $0 ("Created directory at CAPsMAN package path (" . $PackagePath . \
-    "). Please place your packages!") false;
-}
 
-:foreach Package in=[ /file/find where type=package \
-      package-version!=$InstalledVersion name~("^" . $PackagePath) ] do={
-  :local File [ /file/get $Package ];
-  :if ($File->"package-architecture" = "mips") do={
-    :set ($File->"package-architecture") "mipsbe";
+  :if ([ :len [ /file/find where name=$PackagePath type="directory" ] ] = 0) do={
+    :if ([ $MkDir $PackagePath ] = false) do={
+      $LogPrintExit2 warning $ScriptName ("Creating directory at CAPsMAN package path (" . \
+        $PackagePath . ") failed!") true;
+    }
+    $LogPrintExit2 info $ScriptName ("Created directory at CAPsMAN package path (" . $PackagePath . \
+      "). Please place your packages!") false;
   }
-  :if ([ $DownloadPackage ($File->"package-name") $InstalledVersion \
-       ($File->"package-architecture") $PackagePath ] = true) do={
-    :set Updated true;
-    /file/remove $Package;
+
+  :foreach Package in=[ /file/find where type=package \
+        package-version!=$InstalledVersion name~("^" . $PackagePath) ] do={
+    :local File [ /file/get $Package ];
+    :if ($File->"package-architecture" = "mips") do={
+      :set ($File->"package-architecture") "mipsbe";
+    }
+    :if ([ $DownloadPackage ($File->"package-name") $InstalledVersion \
+         ($File->"package-architecture") $PackagePath ] = true) do={
+      :set Updated true;
+      /file/remove $Package;
+    }
   }
-}
 
-:if ([ :len [ /file/find where type=package name~("^" . $PackagePath) ] ] = 0) do={
-  $LogPrintExit2 info $0 ("No packages available, downloading default set.") false;
-  :foreach Arch in={ "arm"; "mipsbe" } do={
-    :foreach Package in={ "routeros"; "wireless" } do={
-      :if ([ $DownloadPackage $Package $InstalledVersion $Arch $PackagePath ] = true) do={
-        :set Updated true;
+  :if ([ :len [ /file/find where type=package name~("^" . $PackagePath) ] ] = 0) do={
+    $LogPrintExit2 info $ScriptName ("No packages available, downloading default set.") false;
+    :foreach Arch in={ "arm"; "mipsbe" } do={
+      :foreach Package in={ "routeros"; "wireless" } do={
+        :if ([ $DownloadPackage $Package $InstalledVersion $Arch $PackagePath ] = true) do={
+          :set Updated true;
+        }
       }
     }
   }
-}
 
-:if ($Updated = true) do={
-  :local Script ([ /system/script/find where source~"\n# provides: capsman-rolling-upgrade\n" ]->0);
-  :if ([ :len $Script ] > 0) do={
-    /system/script/run $Script;
-  } else={
-    /caps-man/remote-cap/upgrade [ find where version!=$InstalledVersion ];
+  :if ($Updated = true) do={
+    :local Script ([ /system/script/find where source~"\n# provides: capsman-rolling-upgrade\n" ]->0);
+    :if ([ :len $Script ] > 0) do={
+      /system/script/run $Script;
+    } else={
+      /caps-man/remote-cap/upgrade [ find where version!=$InstalledVersion ];
+    }
   }
 }
+
+$Main [ :jobname ];
diff --git a/capsman-download-packages.template.rsc b/capsman-download-packages.template.rsc
index 3eaa377..8cc7b2d 100644
--- a/capsman-download-packages.template.rsc
+++ b/capsman-download-packages.template.rsc
@@ -12,85 +12,90 @@
 # !! 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 CleanFilePath;
-:global DownloadPackage;
-:global LogPrintExit2;
-:global MkDir;
-:global ScriptLock;
-:global WaitFullyConnected;
+:local Main do={
+  :local ScriptName [ :tostr $1 ];
 
-$ScriptLock $0;
-$WaitFullyConnected;
+  :global CleanFilePath;
+  :global DownloadPackage;
+  :global LogPrintExit2;
+  :global MkDir;
+  :global ScriptLock;
+  :global WaitFullyConnected;
 
-:local PackagePath [ $CleanFilePath [ /caps-man/manager/get package-path ] ];
-:local PackagePath [ $CleanFilePath [ /interface/wifi/capsman/get package-path ] ];
-:local PackagePath [ $CleanFilePath [ /interface/wifiwave2/capsman/get package-path ] ];
-:local InstalledVersion [ /system/package/update/get installed-version ];
-:local Updated false;
+  $ScriptLock $ScriptName;
+  $WaitFullyConnected;
 
-:if ([ :len $PackagePath ] = 0) do={
-  $LogPrintExit2 warning $0 ("The CAPsMAN package path is not defined, can not download packages.") true;
-}
+  :local PackagePath [ $CleanFilePath [ /caps-man/manager/get package-path ] ];
+  :local PackagePath [ $CleanFilePath [ /interface/wifi/capsman/get package-path ] ];
+  :local PackagePath [ $CleanFilePath [ /interface/wifiwave2/capsman/get package-path ] ];
+  :local InstalledVersion [ /system/package/update/get installed-version ];
+  :local Updated false;
 
-:if ([ :len [ /file/find where name=$PackagePath type="directory" ] ] = 0) do={
-  :if ([ $MkDir $PackagePath ] = false) do={
-    $LogPrintExit2 warning $0 ("Creating directory at CAPsMAN package path (" . \
-      $PackagePath . ") failed!") true;
+  :if ([ :len $PackagePath ] = 0) do={
+    $LogPrintExit2 warning $ScriptName ("The CAPsMAN package path is not defined, can not download packages.") true;
   }
-  $LogPrintExit2 info $0 ("Created directory at CAPsMAN package path (" . $PackagePath . \
-    "). Please place your packages!") false;
-}
 
-:foreach Package in=[ /file/find where type=package \
-      package-version!=$InstalledVersion name~("^" . $PackagePath) ] do={
-  :local File [ /file/get $Package ];
-  :if ($File->"package-architecture" = "mips") do={
-    :set ($File->"package-architecture") "mipsbe";
+  :if ([ :len [ /file/find where name=$PackagePath type="directory" ] ] = 0) do={
+    :if ([ $MkDir $PackagePath ] = false) do={
+      $LogPrintExit2 warning $ScriptName ("Creating directory at CAPsMAN package path (" . \
+        $PackagePath . ") failed!") true;
+    }
+    $LogPrintExit2 info $ScriptName ("Created directory at CAPsMAN package path (" . $PackagePath . \
+      "). Please place your packages!") false;
   }
-  :if ([ $DownloadPackage ($File->"package-name") $InstalledVersion \
-       ($File->"package-architecture") $PackagePath ] = true) do={
-    :set Updated true;
-    /file/remove $Package;
+
+  :foreach Package in=[ /file/find where type=package \
+        package-version!=$InstalledVersion name~("^" . $PackagePath) ] do={
+    :local File [ /file/get $Package ];
+    :if ($File->"package-architecture" = "mips") do={
+      :set ($File->"package-architecture") "mipsbe";
+    }
+    :if ([ $DownloadPackage ($File->"package-name") $InstalledVersion \
+         ($File->"package-architecture") $PackagePath ] = true) do={
+      :set Updated true;
+      /file/remove $Package;
+    }
   }
-}
 
-:if ([ :len [ /file/find where type=package name~("^" . $PackagePath) ] ] = 0) do={
-  $LogPrintExit2 info $0 ("No packages available, downloading default set.") false;
+  :if ([ :len [ /file/find where type=package name~("^" . $PackagePath) ] ] = 0) do={
+    $LogPrintExit2 info $ScriptName ("No packages available, downloading default set.") false;
 # NOT /interface/wifi/ #
 # NOT /interface/wifiwave2/ #
-  :foreach Arch in={ "arm"; "mipsbe" } do={
-    :foreach Package in={ "routeros"; "wireless" } do={
+    :foreach Arch in={ "arm"; "mipsbe" } do={
+      :foreach Package in={ "routeros"; "wireless" } do={
 # NOT /interface/wifi/ #
 # NOT /interface/wifiwave2/ #
 # NOT /caps-man/ #
-  :foreach Arch in={ "arm"; "arm64" } do={
+    :foreach Arch in={ "arm"; "arm64" } do={
 # NOT /interface/wifi/ #
-    :foreach Package in={ "routeros"; "wifiwave2" } do={
+      :foreach Package in={ "routeros"; "wifiwave2" } do={
 # NOT /interface/wifi/ #
 # NOT /interface/wifiwave2/ #
-    :local Packages { "arm"={ "routeros"; "wifi-qcom"; "wifi-qcom-ac" };
-                    "arm64"={ "routeros"; "wifi-qcom" } };
-    :foreach Package in=($Packages->$Arch) do={
+      :local Packages { "arm"={ "routeros"; "wifi-qcom"; "wifi-qcom-ac" };
+                      "arm64"={ "routeros"; "wifi-qcom" } };
+      :foreach Package in=($Packages->$Arch) do={
 # NOT /interface/wifiwave2/ #
 # NOT /caps-man/ #
-      :if ([ $DownloadPackage $Package $InstalledVersion $Arch $PackagePath ] = true) do={
-        :set Updated true;
+        :if ([ $DownloadPackage $Package $InstalledVersion $Arch $PackagePath ] = true) do={
+          :set Updated true;
+        }
       }
     }
   }
-}
 
-:if ($Updated = true) do={
-  :local Script ([ /system/script/find where source~"\n# provides: capsman-rolling-upgrade\n" ]->0);
-  :if ([ :len $Script ] > 0) do={
-    /system/script/run $Script;
-  } else={
-    /caps-man/remote-cap/upgrade [ find where version!=$InstalledVersion ];
-    /interface/wifi/capsman/remote-cap/upgrade [ find where version!=$InstalledVersion ];
-    /interface/wifiwave2/capsman/remote-cap/upgrade [ find where version!=$InstalledVersion ];
+  :if ($Updated = true) do={
+    :local Script ([ /system/script/find where source~"\n# provides: capsman-rolling-upgrade\n" ]->0);
+    :if ([ :len $Script ] > 0) do={
+      /system/script/run $Script;
+    } else={
+      /caps-man/remote-cap/upgrade [ find where version!=$InstalledVersion ];
+      /interface/wifi/capsman/remote-cap/upgrade [ find where version!=$InstalledVersion ];
+      /interface/wifiwave2/capsman/remote-cap/upgrade [ find where version!=$InstalledVersion ];
+    }
   }
 }
+
+$Main [ :jobname ];
diff --git a/capsman-download-packages.wifi.rsc b/capsman-download-packages.wifi.rsc
index 021521e..6f62c54 100644
--- a/capsman-download-packages.wifi.rsc
+++ b/capsman-download-packages.wifi.rsc
@@ -11,68 +11,73 @@
 #
 # !! Do not edit this file, it is generated from template!
 
-:local 0 [ :jobname ];
 :global GlobalFunctionsReady;
 :while ($GlobalFunctionsReady != true) do={ :delay 500ms; }
 
-:global CleanFilePath;
-:global DownloadPackage;
-:global LogPrintExit2;
-:global MkDir;
-:global ScriptLock;
-:global WaitFullyConnected;
+:local Main do={
+  :local ScriptName [ :tostr $1 ];
 
-$ScriptLock $0;
-$WaitFullyConnected;
+  :global CleanFilePath;
+  :global DownloadPackage;
+  :global LogPrintExit2;
+  :global MkDir;
+  :global ScriptLock;
+  :global WaitFullyConnected;
 
-:local PackagePath [ $CleanFilePath [ /interface/wifi/capsman/get package-path ] ];
-:local InstalledVersion [ /system/package/update/get installed-version ];
-:local Updated false;
+  $ScriptLock $ScriptName;
+  $WaitFullyConnected;
 
-:if ([ :len $PackagePath ] = 0) do={
-  $LogPrintExit2 warning $0 ("The CAPsMAN package path is not defined, can not download packages.") true;
-}
+  :local PackagePath [ $CleanFilePath [ /interface/wifi/capsman/get package-path ] ];
+  :local InstalledVersion [ /system/package/update/get installed-version ];
+  :local Updated false;
 
-:if ([ :len [ /file/find where name=$PackagePath type="directory" ] ] = 0) do={
-  :if ([ $MkDir $PackagePath ] = false) do={
-    $LogPrintExit2 warning $0 ("Creating directory at CAPsMAN package path (" . \
-      $PackagePath . ") failed!") true;
+  :if ([ :len $PackagePath ] = 0) do={
+    $LogPrintExit2 warning $ScriptName ("The CAPsMAN package path is not defined, can not download packages.") true;
   }
-  $LogPrintExit2 info $0 ("Created directory at CAPsMAN package path (" . $PackagePath . \
-    "). Please place your packages!") false;
-}
 
-:foreach Package in=[ /file/find where type=package \
-      package-version!=$InstalledVersion name~("^" . $PackagePath) ] do={
-  :local File [ /file/get $Package ];
-  :if ($File->"package-architecture" = "mips") do={
-    :set ($File->"package-architecture") "mipsbe";
+  :if ([ :len [ /file/find where name=$PackagePath type="directory" ] ] = 0) do={
+    :if ([ $MkDir $PackagePath ] = false) do={
+      $LogPrintExit2 warning $ScriptName ("Creating directory at CAPsMAN package path (" . \
+        $PackagePath . ") failed!") true;
+    }
+    $LogPrintExit2 info $ScriptName ("Created directory at CAPsMAN package path (" . $PackagePath . \
+      "). Please place your packages!") false;
   }
-  :if ([ $DownloadPackage ($File->"package-name") $InstalledVersion \
-       ($File->"package-architecture") $PackagePath ] = true) do={
-    :set Updated true;
-    /file/remove $Package;
+
+  :foreach Package in=[ /file/find where type=package \
+        package-version!=$InstalledVersion name~("^" . $PackagePath) ] do={
+    :local File [ /file/get $Package ];
+    :if ($File->"package-architecture" = "mips") do={
+      :set ($File->"package-architecture") "mipsbe";
+    }
+    :if ([ $DownloadPackage ($File->"package-name") $InstalledVersion \
+         ($File->"package-architecture") $PackagePath ] = true) do={
+      :set Updated true;
+      /file/remove $Package;
+    }
   }
-}
 
-:if ([ :len [ /file/find where type=package name~("^" . $PackagePath) ] ] = 0) do={
-  $LogPrintExit2 info $0 ("No packages available, downloading default set.") false;
-  :foreach Arch in={ "arm"; "arm64" } do={
-    :local Packages { "arm"={ "routeros"; "wifi-qcom"; "wifi-qcom-ac" };
-                    "arm64"={ "routeros"; "wifi-qcom" } };
-    :foreach Package in=($Packages->$Arch) do={
-      :if ([ $DownloadPackage $Package $InstalledVersion $Arch $PackagePath ] = true) do={
-        :set Updated true;
+  :if ([ :len [ /file/find where type=package name~("^" . $PackagePath) ] ] = 0) do={
+    $LogPrintExit2 info $ScriptName ("No packages available, downloading default set.") false;
+    :foreach Arch in={ "arm"; "arm64" } do={
+      :local Packages { "arm"={ "routeros"; "wifi-qcom"; "wifi-qcom-ac" };
+                      "arm64"={ "routeros"; "wifi-qcom" } };
+      :foreach Package in=($Packages->$Arch) do={
+        :if ([ $DownloadPackage $Package $InstalledVersion $Arch $PackagePath ] = true) do={
+          :set Updated true;
+        }
       }
     }
   }
-}
 
-:if ($Updated = true) do={
-  :local Script ([ /system/script/find where source~"\n# provides: capsman-rolling-upgrade\n" ]->0);
-  :if ([ :len $Script ] > 0) do={
-    /system/script/run $Script;
-  } else={
-    /interface/wifi/capsman/remote-cap/upgrade [ find where version!=$InstalledVersion ];
+  :if ($Updated = true) do={
+    :local Script ([ /system/script/find where source~"\n# provides: capsman-rolling-upgrade\n" ]->0);
+    :if ([ :len $Script ] > 0) do={
+      /system/script/run $Script;
+    } else={
+      /interface/wifi/capsman/remote-cap/upgrade [ find where version!=$InstalledVersion ];
+    }
   }
 }
+
+$Main [ :jobname ];
diff --git a/capsman-download-packages.wifiwave2.rsc b/capsman-download-packages.wifiwave2.rsc
index 29dca8a..705da70 100644
--- a/capsman-download-packages.wifiwave2.rsc
+++ b/capsman-download-packages.wifiwave2.rsc
@@ -11,66 +11,71 @@
 #
 # !! Do not edit this file, it is generated from template!
 
-:local 0 [ :jobname ];
 :global GlobalFunctionsReady;
 :while ($GlobalFunctionsReady != true) do={ :delay 500ms; }
 
-:global CleanFilePath;
-:global DownloadPackage;
-:global LogPrintExit2;
-:global MkDir;
-:global ScriptLock;
-:global WaitFullyConnected;
+:local Main do={
+  :local ScriptName [ :tostr $1 ];
 
-$ScriptLock $0;
-$WaitFullyConnected;
+  :global CleanFilePath;
+  :global DownloadPackage;
+  :global LogPrintExit2;
+  :global MkDir;
+  :global ScriptLock;
+  :global WaitFullyConnected;
 
-:local PackagePath [ $CleanFilePath [ /interface/wifiwave2/capsman/get package-path ] ];
-:local InstalledVersion [ /system/package/update/get installed-version ];
-:local Updated false;
+  $ScriptLock $ScriptName;
+  $WaitFullyConnected;
 
-:if ([ :len $PackagePath ] = 0) do={
-  $LogPrintExit2 warning $0 ("The CAPsMAN package path is not defined, can not download packages.") true;
-}
+  :local PackagePath [ $CleanFilePath [ /interface/wifiwave2/capsman/get package-path ] ];
+  :local InstalledVersion [ /system/package/update/get installed-version ];
+  :local Updated false;
 
-:if ([ :len [ /file/find where name=$PackagePath type="directory" ] ] = 0) do={
-  :if ([ $MkDir $PackagePath ] = false) do={
-    $LogPrintExit2 warning $0 ("Creating directory at CAPsMAN package path (" . \
-      $PackagePath . ") failed!") true;
+  :if ([ :len $PackagePath ] = 0) do={
+    $LogPrintExit2 warning $ScriptName ("The CAPsMAN package path is not defined, can not download packages.") true;
   }
-  $LogPrintExit2 info $0 ("Created directory at CAPsMAN package path (" . $PackagePath . \
-    "). Please place your packages!") false;
-}
 
-:foreach Package in=[ /file/find where type=package \
-      package-version!=$InstalledVersion name~("^" . $PackagePath) ] do={
-  :local File [ /file/get $Package ];
-  :if ($File->"package-architecture" = "mips") do={
-    :set ($File->"package-architecture") "mipsbe";
+  :if ([ :len [ /file/find where name=$PackagePath type="directory" ] ] = 0) do={
+    :if ([ $MkDir $PackagePath ] = false) do={
+      $LogPrintExit2 warning $ScriptName ("Creating directory at CAPsMAN package path (" . \
+        $PackagePath . ") failed!") true;
+    }
+    $LogPrintExit2 info $ScriptName ("Created directory at CAPsMAN package path (" . $PackagePath . \
+      "). Please place your packages!") false;
   }
-  :if ([ $DownloadPackage ($File->"package-name") $InstalledVersion \
-       ($File->"package-architecture") $PackagePath ] = true) do={
-    :set Updated true;
-    /file/remove $Package;
+
+  :foreach Package in=[ /file/find where type=package \
+        package-version!=$InstalledVersion name~("^" . $PackagePath) ] do={
+    :local File [ /file/get $Package ];
+    :if ($File->"package-architecture" = "mips") do={
+      :set ($File->"package-architecture") "mipsbe";
+    }
+    :if ([ $DownloadPackage ($File->"package-name") $InstalledVersion \
+         ($File->"package-architecture") $PackagePath ] = true) do={
+      :set Updated true;
+      /file/remove $Package;
+    }
   }
-}
 
-:if ([ :len [ /file/find where type=package name~("^" . $PackagePath) ] ] = 0) do={
-  $LogPrintExit2 info $0 ("No packages available, downloading default set.") false;
-  :foreach Arch in={ "arm"; "arm64" } do={
-    :foreach Package in={ "routeros"; "wifiwave2" } do={
-      :if ([ $DownloadPackage $Package $InstalledVersion $Arch $PackagePath ] = true) do={
-        :set Updated true;
+  :if ([ :len [ /file/find where type=package name~("^" . $PackagePath) ] ] = 0) do={
+    $LogPrintExit2 info $ScriptName ("No packages available, downloading default set.") false;
+    :foreach Arch in={ "arm"; "arm64" } do={
+      :foreach Package in={ "routeros"; "wifiwave2" } do={
+        :if ([ $DownloadPackage $Package $InstalledVersion $Arch $PackagePath ] = true) do={
+          :set Updated true;
+        }
       }
     }
   }
-}
 
-:if ($Updated = true) do={
-  :local Script ([ /system/script/find where source~"\n# provides: capsman-rolling-upgrade\n" ]->0);
-  :if ([ :len $Script ] > 0) do={
-    /system/script/run $Script;
-  } else={
-    /interface/wifiwave2/capsman/remote-cap/upgrade [ find where version!=$InstalledVersion ];
+  :if ($Updated = true) do={
+    :local Script ([ /system/script/find where source~"\n# provides: capsman-rolling-upgrade\n" ]->0);
+    :if ([ :len $Script ] > 0) do={
+      /system/script/run $Script;
+    } else={
+      /interface/wifiwave2/capsman/remote-cap/upgrade [ find where version!=$InstalledVersion ];
+    }
   }
 }
+
+$Main [ :jobname ];
-- 
cgit v1.2.3-70-g09d2