File tree Expand file tree Collapse file tree
images/linux/scripts/SoftwareReport Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -16,25 +16,18 @@ function Get-AndroidSDKManagerPath {
1616
1717function Get-AndroidInstalledPackages {
1818 $androidSDKManagerPath = Get-AndroidSDKManagerPath
19- $androidSDKManagerList = Invoke-Expression " $androidSDKManagerPath --list --include_obsolete"
20- $androidInstalledPackages = @ ()
21- foreach ($packageInfo in $androidSDKManagerList ) {
22- if ($packageInfo -Match " Available Packages:" ) {
23- break
24- }
25-
26- $androidInstalledPackages += $packageInfo
27- }
28- return $androidInstalledPackages
19+ $androidSDKManagerList = Invoke-Expression " $androidSDKManagerPath --list_installed --include_obsolete"
20+ return $androidSDKManagerList
2921}
3022
3123
3224function Build-AndroidTable {
3325 $packageInfo = Get-AndroidInstalledPackages
26+ $commandLineTools = Get-AndroidSDKManagerPath
3427 return @ (
3528 @ {
3629 " Package" = " Android Command Line Tools"
37- " Version" = Get-AndroidPackageVersions - PackageInfo $packageInfo - MatchedString " Android SDK Command-line Tools "
30+ " Version" = ( & $commandLineTools -- version 2> $null | Out-String ).Trim()
3831 },
3932 @ {
4033 " Package" = " Android Emulator"
You can’t perform that action at this time.
0 commit comments