aboutsummaryrefslogtreecommitdiffstats
path: root/capsman-download-packages.template.rsc
diff options
context:
space:
mode:
authorGravatar Christian Hesse <mail@eworm.de>2023-11-14 23:36:13 +0100
committerGravatar Christian Hesse <mail@eworm.de>2023-11-15 14:34:40 +0100
commita4b2da8087160ec2cf2ac12183c63b5609596f3d (patch)
tree841ee15fa781bb1dd266e6f521182208d3d064f6 /capsman-download-packages.template.rsc
parent3aec5d70c628003634fc413cdb00b2e1e0c9fca5 (diff)
parent4c3430fbb66489e11174caed38ccf8593d5903cb (diff)
Merge branch 'wifi' into nextrouteros-7.13beta1-2
Diffstat (limited to 'capsman-download-packages.template.rsc')
-rw-r--r--capsman-download-packages.template.rsc17
1 files changed, 13 insertions, 4 deletions
diff --git a/capsman-download-packages.template.rsc b/capsman-download-packages.template.rsc
index 80f1988..7b37c36 100644
--- a/capsman-download-packages.template.rsc
+++ b/capsman-download-packages.template.rsc
@@ -25,6 +25,7 @@ $ScriptLock $0;
$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;
@@ -55,7 +56,8 @@ $WaitFullyConnected;
}
}
-# NOT /interface/wifiwave2 #
+# NOT /interface/wifi/ #
+# NOT /interface/wifiwave2/ #
:if ([ :len [ /system/logging/find where topics~"error" !(topics~"!error") \
!(topics~"!caps") action=memory !disabled !invalid ] ] < 1) do={
$LogPrintExit2 warning $0 ("Looks like error messages for 'caps' are not sent to memory. " . \
@@ -81,19 +83,25 @@ $WaitFullyConnected;
:set Updated true;
}
}
-# NOT /interface/wifiwave2 #
-# NOT /caps-man #
+# NOT /interface/wifiwave2/ #
+# NOT /interface/wifi/ #
+# NOT /caps-man/ #
: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={
+# NOT /interface/wifi/ #
:foreach Package in={ "routeros"; "wifiwave2" } do={
+# NOT /interface/wifi/ #
+# NOT /interface/wifiwave2/ #
+ :foreach Package in={ "routeros"; "wifi-qcom"; "wifi-qcom-ac" } do={
+# NOT /interface/wifiwave2/ #
:if ([ $DownloadPackage $Package $InstalledVersion $Arch $PackagePath ] = true) do={
:set Updated true;
}
}
}
}
-# NOT /caps-man #
+# NOT /caps-man/ #
:if ($Updated = true) do={
:local Script ([ /system/script/find where source~"\n# provides: capsman-rolling-upgrade\n" ]->0);
@@ -101,6 +109,7 @@ $WaitFullyConnected;
/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 ];
}
}