From 5eb130f0fc137bc3fa02d6a28b75f2c9a3b101de Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Tue, 14 Nov 2023 10:26:06 +0100
Subject: capsman-download-packages: support new wifi package

---
 capsman-download-packages.template.rsc | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'capsman-download-packages.template.rsc')

diff --git a/capsman-download-packages.template.rsc b/capsman-download-packages.template.rsc
index 88fda60..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,6 +56,7 @@ $WaitFullyConnected;
   }
 }
 
+# NOT /interface/wifi/ #
 # NOT /interface/wifiwave2/ #
 :if ([ :len [ /system/logging/find where topics~"error" !(topics~"!error") \
      !(topics~"!caps") action=memory !disabled !invalid ] ] < 1) do={
@@ -82,11 +84,17 @@ $WaitFullyConnected;
   }
 }
 # 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;
       }
@@ -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 ];
   }
 }
-- 
cgit v1.2.3-54-g00ecf