capsman-download-packages: move code into function

This commit is contained in:
Christian Hesse 2024-03-04 13:48:00 +01:00
parent 1c26dde356
commit c2df671d6f
4 changed files with 219 additions and 199 deletions

View file

@ -11,38 +11,40 @@
# #
# !! Do not edit this file, it is generated from template! # !! Do not edit this file, it is generated from template!
:local 0 [ :jobname ];
:global GlobalFunctionsReady; :global GlobalFunctionsReady;
:while ($GlobalFunctionsReady != true) do={ :delay 500ms; } :while ($GlobalFunctionsReady != true) do={ :delay 500ms; }
:global CleanFilePath; :local Main do={
:global DownloadPackage; :local ScriptName [ :tostr $1 ];
:global LogPrintExit2;
:global MkDir;
:global ScriptLock;
:global WaitFullyConnected;
$ScriptLock $0; :global CleanFilePath;
$WaitFullyConnected; :global DownloadPackage;
:global LogPrintExit2;
:global MkDir;
:global ScriptLock;
:global WaitFullyConnected;
:local PackagePath [ $CleanFilePath [ /caps-man/manager/get package-path ] ]; $ScriptLock $ScriptName;
:local InstalledVersion [ /system/package/update/get installed-version ]; $WaitFullyConnected;
:local Updated false;
:if ([ :len $PackagePath ] = 0) do={ :local PackagePath [ $CleanFilePath [ /caps-man/manager/get package-path ] ];
$LogPrintExit2 warning $0 ("The CAPsMAN package path is not defined, can not download packages.") true; :local InstalledVersion [ /system/package/update/get installed-version ];
} :local Updated false;
:if ([ :len [ /file/find where name=$PackagePath type="directory" ] ] = 0) do={ :if ([ :len $PackagePath ] = 0) do={
$LogPrintExit2 warning $ScriptName ("The CAPsMAN package path is not defined, can not download packages.") true;
}
:if ([ :len [ /file/find where name=$PackagePath type="directory" ] ] = 0) do={
:if ([ $MkDir $PackagePath ] = false) do={ :if ([ $MkDir $PackagePath ] = false) do={
$LogPrintExit2 warning $0 ("Creating directory at CAPsMAN package path (" . \ $LogPrintExit2 warning $ScriptName ("Creating directory at CAPsMAN package path (" . \
$PackagePath . ") failed!") true; $PackagePath . ") failed!") true;
} }
$LogPrintExit2 info $0 ("Created directory at CAPsMAN package path (" . $PackagePath . \ $LogPrintExit2 info $ScriptName ("Created directory at CAPsMAN package path (" . $PackagePath . \
"). Please place your packages!") false; "). Please place your packages!") false;
} }
:foreach Package in=[ /file/find where type=package \ :foreach Package in=[ /file/find where type=package \
package-version!=$InstalledVersion name~("^" . $PackagePath) ] do={ package-version!=$InstalledVersion name~("^" . $PackagePath) ] do={
:local File [ /file/get $Package ]; :local File [ /file/get $Package ];
:if ($File->"package-architecture" = "mips") do={ :if ($File->"package-architecture" = "mips") do={
@ -53,10 +55,10 @@ $WaitFullyConnected;
:set Updated true; :set Updated true;
/file/remove $Package; /file/remove $Package;
} }
} }
:if ([ :len [ /file/find where type=package name~("^" . $PackagePath) ] ] = 0) do={ :if ([ :len [ /file/find where type=package name~("^" . $PackagePath) ] ] = 0) do={
$LogPrintExit2 info $0 ("No packages available, downloading default set.") false; $LogPrintExit2 info $ScriptName ("No packages available, downloading default set.") false;
:foreach Arch in={ "arm"; "mipsbe" } do={ :foreach Arch in={ "arm"; "mipsbe" } do={
:foreach Package in={ "routeros"; "wireless" } do={ :foreach Package in={ "routeros"; "wireless" } do={
:if ([ $DownloadPackage $Package $InstalledVersion $Arch $PackagePath ] = true) do={ :if ([ $DownloadPackage $Package $InstalledVersion $Arch $PackagePath ] = true) do={
@ -64,13 +66,16 @@ $WaitFullyConnected;
} }
} }
} }
} }
:if ($Updated = true) do={ :if ($Updated = true) do={
:local Script ([ /system/script/find where source~"\n# provides: capsman-rolling-upgrade\n" ]->0); :local Script ([ /system/script/find where source~"\n# provides: capsman-rolling-upgrade\n" ]->0);
:if ([ :len $Script ] > 0) do={ :if ([ :len $Script ] > 0) do={
/system/script/run $Script; /system/script/run $Script;
} else={ } else={
/caps-man/remote-cap/upgrade [ find where version!=$InstalledVersion ]; /caps-man/remote-cap/upgrade [ find where version!=$InstalledVersion ];
} }
}
} }
$Main [ :jobname ];

View file

@ -12,40 +12,42 @@
# !! This is just a template to generate the real script! # !! This is just a template to generate the real script!
# !! Pattern '%TEMPL%' is replaced, paths are filtered. # !! Pattern '%TEMPL%' is replaced, paths are filtered.
:local 0 [ :jobname ];
:global GlobalFunctionsReady; :global GlobalFunctionsReady;
:while ($GlobalFunctionsReady != true) do={ :delay 500ms; } :while ($GlobalFunctionsReady != true) do={ :delay 500ms; }
:global CleanFilePath; :local Main do={
:global DownloadPackage; :local ScriptName [ :tostr $1 ];
:global LogPrintExit2;
:global MkDir;
:global ScriptLock;
:global WaitFullyConnected;
$ScriptLock $0; :global CleanFilePath;
$WaitFullyConnected; :global DownloadPackage;
:global LogPrintExit2;
:global MkDir;
:global ScriptLock;
:global WaitFullyConnected;
:local PackagePath [ $CleanFilePath [ /caps-man/manager/get package-path ] ]; $ScriptLock $ScriptName;
:local PackagePath [ $CleanFilePath [ /interface/wifi/capsman/get package-path ] ]; $WaitFullyConnected;
:local PackagePath [ $CleanFilePath [ /interface/wifiwave2/capsman/get package-path ] ];
:local InstalledVersion [ /system/package/update/get installed-version ];
:local Updated false;
:if ([ :len $PackagePath ] = 0) do={ :local PackagePath [ $CleanFilePath [ /caps-man/manager/get package-path ] ];
$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 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 ([ :len $PackagePath ] = 0) do={
$LogPrintExit2 warning $ScriptName ("The CAPsMAN package path is not defined, can not download packages.") true;
}
:if ([ :len [ /file/find where name=$PackagePath type="directory" ] ] = 0) do={
:if ([ $MkDir $PackagePath ] = false) do={ :if ([ $MkDir $PackagePath ] = false) do={
$LogPrintExit2 warning $0 ("Creating directory at CAPsMAN package path (" . \ $LogPrintExit2 warning $ScriptName ("Creating directory at CAPsMAN package path (" . \
$PackagePath . ") failed!") true; $PackagePath . ") failed!") true;
} }
$LogPrintExit2 info $0 ("Created directory at CAPsMAN package path (" . $PackagePath . \ $LogPrintExit2 info $ScriptName ("Created directory at CAPsMAN package path (" . $PackagePath . \
"). Please place your packages!") false; "). Please place your packages!") false;
} }
:foreach Package in=[ /file/find where type=package \ :foreach Package in=[ /file/find where type=package \
package-version!=$InstalledVersion name~("^" . $PackagePath) ] do={ package-version!=$InstalledVersion name~("^" . $PackagePath) ] do={
:local File [ /file/get $Package ]; :local File [ /file/get $Package ];
:if ($File->"package-architecture" = "mips") do={ :if ($File->"package-architecture" = "mips") do={
@ -56,10 +58,10 @@ $WaitFullyConnected;
:set Updated true; :set Updated true;
/file/remove $Package; /file/remove $Package;
} }
} }
:if ([ :len [ /file/find where type=package name~("^" . $PackagePath) ] ] = 0) do={ :if ([ :len [ /file/find where type=package name~("^" . $PackagePath) ] ] = 0) do={
$LogPrintExit2 info $0 ("No packages available, downloading default set.") false; $LogPrintExit2 info $ScriptName ("No packages available, downloading default set.") false;
# NOT /interface/wifi/ # # NOT /interface/wifi/ #
# NOT /interface/wifiwave2/ # # NOT /interface/wifiwave2/ #
:foreach Arch in={ "arm"; "mipsbe" } do={ :foreach Arch in={ "arm"; "mipsbe" } do={
@ -82,9 +84,9 @@ $WaitFullyConnected;
} }
} }
} }
} }
:if ($Updated = true) do={ :if ($Updated = true) do={
:local Script ([ /system/script/find where source~"\n# provides: capsman-rolling-upgrade\n" ]->0); :local Script ([ /system/script/find where source~"\n# provides: capsman-rolling-upgrade\n" ]->0);
:if ([ :len $Script ] > 0) do={ :if ([ :len $Script ] > 0) do={
/system/script/run $Script; /system/script/run $Script;
@ -93,4 +95,7 @@ $WaitFullyConnected;
/interface/wifi/capsman/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 ]; /interface/wifiwave2/capsman/remote-cap/upgrade [ find where version!=$InstalledVersion ];
} }
}
} }
$Main [ :jobname ];

View file

@ -11,38 +11,40 @@
# #
# !! Do not edit this file, it is generated from template! # !! Do not edit this file, it is generated from template!
:local 0 [ :jobname ];
:global GlobalFunctionsReady; :global GlobalFunctionsReady;
:while ($GlobalFunctionsReady != true) do={ :delay 500ms; } :while ($GlobalFunctionsReady != true) do={ :delay 500ms; }
:global CleanFilePath; :local Main do={
:global DownloadPackage; :local ScriptName [ :tostr $1 ];
:global LogPrintExit2;
:global MkDir;
:global ScriptLock;
:global WaitFullyConnected;
$ScriptLock $0; :global CleanFilePath;
$WaitFullyConnected; :global DownloadPackage;
:global LogPrintExit2;
:global MkDir;
:global ScriptLock;
:global WaitFullyConnected;
:local PackagePath [ $CleanFilePath [ /interface/wifi/capsman/get package-path ] ]; $ScriptLock $ScriptName;
:local InstalledVersion [ /system/package/update/get installed-version ]; $WaitFullyConnected;
:local Updated false;
:if ([ :len $PackagePath ] = 0) do={ :local PackagePath [ $CleanFilePath [ /interface/wifi/capsman/get package-path ] ];
$LogPrintExit2 warning $0 ("The CAPsMAN package path is not defined, can not download packages.") true; :local InstalledVersion [ /system/package/update/get installed-version ];
} :local Updated false;
:if ([ :len [ /file/find where name=$PackagePath type="directory" ] ] = 0) do={ :if ([ :len $PackagePath ] = 0) do={
$LogPrintExit2 warning $ScriptName ("The CAPsMAN package path is not defined, can not download packages.") true;
}
:if ([ :len [ /file/find where name=$PackagePath type="directory" ] ] = 0) do={
:if ([ $MkDir $PackagePath ] = false) do={ :if ([ $MkDir $PackagePath ] = false) do={
$LogPrintExit2 warning $0 ("Creating directory at CAPsMAN package path (" . \ $LogPrintExit2 warning $ScriptName ("Creating directory at CAPsMAN package path (" . \
$PackagePath . ") failed!") true; $PackagePath . ") failed!") true;
} }
$LogPrintExit2 info $0 ("Created directory at CAPsMAN package path (" . $PackagePath . \ $LogPrintExit2 info $ScriptName ("Created directory at CAPsMAN package path (" . $PackagePath . \
"). Please place your packages!") false; "). Please place your packages!") false;
} }
:foreach Package in=[ /file/find where type=package \ :foreach Package in=[ /file/find where type=package \
package-version!=$InstalledVersion name~("^" . $PackagePath) ] do={ package-version!=$InstalledVersion name~("^" . $PackagePath) ] do={
:local File [ /file/get $Package ]; :local File [ /file/get $Package ];
:if ($File->"package-architecture" = "mips") do={ :if ($File->"package-architecture" = "mips") do={
@ -53,10 +55,10 @@ $WaitFullyConnected;
:set Updated true; :set Updated true;
/file/remove $Package; /file/remove $Package;
} }
} }
:if ([ :len [ /file/find where type=package name~("^" . $PackagePath) ] ] = 0) do={ :if ([ :len [ /file/find where type=package name~("^" . $PackagePath) ] ] = 0) do={
$LogPrintExit2 info $0 ("No packages available, downloading default set.") false; $LogPrintExit2 info $ScriptName ("No packages available, downloading default set.") false;
:foreach Arch in={ "arm"; "arm64" } do={ :foreach Arch in={ "arm"; "arm64" } do={
:local Packages { "arm"={ "routeros"; "wifi-qcom"; "wifi-qcom-ac" }; :local Packages { "arm"={ "routeros"; "wifi-qcom"; "wifi-qcom-ac" };
"arm64"={ "routeros"; "wifi-qcom" } }; "arm64"={ "routeros"; "wifi-qcom" } };
@ -66,13 +68,16 @@ $WaitFullyConnected;
} }
} }
} }
} }
:if ($Updated = true) do={ :if ($Updated = true) do={
:local Script ([ /system/script/find where source~"\n# provides: capsman-rolling-upgrade\n" ]->0); :local Script ([ /system/script/find where source~"\n# provides: capsman-rolling-upgrade\n" ]->0);
:if ([ :len $Script ] > 0) do={ :if ([ :len $Script ] > 0) do={
/system/script/run $Script; /system/script/run $Script;
} else={ } else={
/interface/wifi/capsman/remote-cap/upgrade [ find where version!=$InstalledVersion ]; /interface/wifi/capsman/remote-cap/upgrade [ find where version!=$InstalledVersion ];
} }
}
} }
$Main [ :jobname ];

View file

@ -11,38 +11,40 @@
# #
# !! Do not edit this file, it is generated from template! # !! Do not edit this file, it is generated from template!
:local 0 [ :jobname ];
:global GlobalFunctionsReady; :global GlobalFunctionsReady;
:while ($GlobalFunctionsReady != true) do={ :delay 500ms; } :while ($GlobalFunctionsReady != true) do={ :delay 500ms; }
:global CleanFilePath; :local Main do={
:global DownloadPackage; :local ScriptName [ :tostr $1 ];
:global LogPrintExit2;
:global MkDir;
:global ScriptLock;
:global WaitFullyConnected;
$ScriptLock $0; :global CleanFilePath;
$WaitFullyConnected; :global DownloadPackage;
:global LogPrintExit2;
:global MkDir;
:global ScriptLock;
:global WaitFullyConnected;
:local PackagePath [ $CleanFilePath [ /interface/wifiwave2/capsman/get package-path ] ]; $ScriptLock $ScriptName;
:local InstalledVersion [ /system/package/update/get installed-version ]; $WaitFullyConnected;
:local Updated false;
:if ([ :len $PackagePath ] = 0) do={ :local PackagePath [ $CleanFilePath [ /interface/wifiwave2/capsman/get package-path ] ];
$LogPrintExit2 warning $0 ("The CAPsMAN package path is not defined, can not download packages.") true; :local InstalledVersion [ /system/package/update/get installed-version ];
} :local Updated false;
:if ([ :len [ /file/find where name=$PackagePath type="directory" ] ] = 0) do={ :if ([ :len $PackagePath ] = 0) do={
$LogPrintExit2 warning $ScriptName ("The CAPsMAN package path is not defined, can not download packages.") true;
}
:if ([ :len [ /file/find where name=$PackagePath type="directory" ] ] = 0) do={
:if ([ $MkDir $PackagePath ] = false) do={ :if ([ $MkDir $PackagePath ] = false) do={
$LogPrintExit2 warning $0 ("Creating directory at CAPsMAN package path (" . \ $LogPrintExit2 warning $ScriptName ("Creating directory at CAPsMAN package path (" . \
$PackagePath . ") failed!") true; $PackagePath . ") failed!") true;
} }
$LogPrintExit2 info $0 ("Created directory at CAPsMAN package path (" . $PackagePath . \ $LogPrintExit2 info $ScriptName ("Created directory at CAPsMAN package path (" . $PackagePath . \
"). Please place your packages!") false; "). Please place your packages!") false;
} }
:foreach Package in=[ /file/find where type=package \ :foreach Package in=[ /file/find where type=package \
package-version!=$InstalledVersion name~("^" . $PackagePath) ] do={ package-version!=$InstalledVersion name~("^" . $PackagePath) ] do={
:local File [ /file/get $Package ]; :local File [ /file/get $Package ];
:if ($File->"package-architecture" = "mips") do={ :if ($File->"package-architecture" = "mips") do={
@ -53,10 +55,10 @@ $WaitFullyConnected;
:set Updated true; :set Updated true;
/file/remove $Package; /file/remove $Package;
} }
} }
:if ([ :len [ /file/find where type=package name~("^" . $PackagePath) ] ] = 0) do={ :if ([ :len [ /file/find where type=package name~("^" . $PackagePath) ] ] = 0) do={
$LogPrintExit2 info $0 ("No packages available, downloading default set.") false; $LogPrintExit2 info $ScriptName ("No packages available, downloading default set.") false;
:foreach Arch in={ "arm"; "arm64" } do={ :foreach Arch in={ "arm"; "arm64" } do={
:foreach Package in={ "routeros"; "wifiwave2" } do={ :foreach Package in={ "routeros"; "wifiwave2" } do={
:if ([ $DownloadPackage $Package $InstalledVersion $Arch $PackagePath ] = true) do={ :if ([ $DownloadPackage $Package $InstalledVersion $Arch $PackagePath ] = true) do={
@ -64,13 +66,16 @@ $WaitFullyConnected;
} }
} }
} }
} }
:if ($Updated = true) do={ :if ($Updated = true) do={
:local Script ([ /system/script/find where source~"\n# provides: capsman-rolling-upgrade\n" ]->0); :local Script ([ /system/script/find where source~"\n# provides: capsman-rolling-upgrade\n" ]->0);
:if ([ :len $Script ] > 0) do={ :if ([ :len $Script ] > 0) do={
/system/script/run $Script; /system/script/run $Script;
} else={ } else={
/interface/wifiwave2/capsman/remote-cap/upgrade [ find where version!=$InstalledVersion ]; /interface/wifiwave2/capsman/remote-cap/upgrade [ find where version!=$InstalledVersion ];
} }
}
} }
$Main [ :jobname ];