Fix Get-AndroidPackages function for macOS

actions · Jun 14, 2023 · 45b89d7 · 45b89d7
1 parent d3a5902
commit 45b89d7
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/images/macos/software-report/SoftwareReport.Android.psm1 b/images/macos/software-report/SoftwareReport.Android.psm1
@@ -24,10 +24,13 @@ function Get-AndroidInstalledPackages {
 }
 
 function Get-AndroidPackages {
+    $androidSDKDir = Get-AndroidSDKRoot
+    $androidSDKManagerPath = Get-AndroidSDKManagerPath
+
     $packagesListFile = Join-Path $androidSDKDir "packages-list.txt"
 
     if (-Not (Test-Path -Path $packagesListFile -PathType Leaf)) {
-        (/usr/local/lib/android/sdk/cmdline-tools/latest/bin/sdkmanager --list --verbose) |
+        (& $androidSDKManagerPath --list --verbose) |
         Where-Object { $_ -Match "^[^\s]" } |
         Where-Object { $_ -NotMatch "^(Loading |Info: Parsing |---|\[=+|Installed |Available )" } |
         Where-Object { $_ -NotMatch "^[^;]*$" } |