catmeow/setup-android
1
0
Fork 0
mirror of https://github.com/android-actions/setup-android synced 2024-11-22 13:29:35 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

Call sdkmanager, not .bat on windows too, it just works

Browse source
This commit is contained in:
Vilius Sutkus '89 2021-02-03 03:35:41 +02:00 committed by Dave Olsthoorn
parent 1edf194eee
commit 6bde8445cd
1 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/main.ts
View file

@ -19,16 +19,13 @@ const ANDROID_SDK_ROOT = process.env['ANDROID_SDK_ROOT'] || ANDROID_HOME_SDK_DIR
const ANDROID_REPOSITORIES_CFG = path.join(ANDROID_SDK_ROOT, 'repositories.cfg') const ANDROID_REPOSITORIES_CFG = path.join(ANDROID_SDK_ROOT, 'repositories.cfg')
function getSdkManagerPath(cmdToolsVersion: string): string { function getSdkManagerPath(cmdToolsVersion: string): string {
const toolsBinDir = path.join( return path.join(
ANDROID_SDK_ROOT, ANDROID_SDK_ROOT,
'cmdline-tools', 'cmdline-tools',
cmdToolsVersion, cmdToolsVersion,
'bin' 'bin',
'sdkmanager'
) )
if ('win32' === process.platform) {
return path.join(toolsBinDir, 'sdkmanager.bat')
}
return path.join(toolsBinDir, 'sdkmanager')
} }
function findPreinstalledSdkManager(): { function findPreinstalledSdkManager(): {