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

correct bin path for sdkmanager

Browse source
This commit is contained in:
Dave Olsthoorn 2020-07-25 18:37:02 +02:00
parent 90244e0383
commit 4de319a2e2
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
dist/main/index.js vendored
View file

File diff suppressed because one or more lines are too long

6
src/install.ts
View file

@ -24,7 +24,7 @@ export async function install(): Promise<void> {
if (process.platform === 'linux') { if (process.platform === 'linux') {
const cmdlineToolsZip = await tc.downloadTool(COMMANDLINE_TOOLS_LIN_URL) const cmdlineToolsZip = await tc.downloadTool(COMMANDLINE_TOOLS_LIN_URL)
const cmdlineTools = await tc.extractZip(cmdlineToolsZip) const cmdlineTools = await tc.extractZip(cmdlineToolsZip)
const sdkManager = path.join(cmdlineTools, 'tools', 'sdkmanager') const sdkManager = path.join(cmdlineTools, 'tools', 'bin', 'sdkmanager')
console.log(fs.readdirSync(cmdlineTools)) console.log(fs.readdirSync(cmdlineTools))
console.log(fs.existsSync(sdkManager)) console.log(fs.existsSync(sdkManager))
@ -39,7 +39,7 @@ export async function install(): Promise<void> {
} else if (process.platform === 'darwin') { } else if (process.platform === 'darwin') {
const cmdlineToolsZip = await tc.downloadTool(COMMANDLINE_TOOLS_MAC_URL) const cmdlineToolsZip = await tc.downloadTool(COMMANDLINE_TOOLS_MAC_URL)
const cmdlineTools = await tc.extractZip(cmdlineToolsZip) const cmdlineTools = await tc.extractZip(cmdlineToolsZip)
const sdkManager = path.join(cmdlineTools, 'tools', 'sdkmanager') const sdkManager = path.join(cmdlineTools, 'tools', 'bin', 'sdkmanager')
exec.exec( exec.exec(
sdkManager, sdkManager,
@ -51,7 +51,7 @@ export async function install(): Promise<void> {
} else if (process.platform === 'win32') { } else if (process.platform === 'win32') {
const cmdlineToolsZip = await tc.downloadTool(COMMANDLINE_TOOLS_WIN_URL) const cmdlineToolsZip = await tc.downloadTool(COMMANDLINE_TOOLS_WIN_URL)
const cmdlineTools = await tc.extractZip(cmdlineToolsZip) const cmdlineTools = await tc.extractZip(cmdlineToolsZip)
const sdkManager = path.join(cmdlineTools, 'tools', 'sdkmanager.bat') const sdkManager = path.join(cmdlineTools, 'tools', 'bin', 'sdkmanager.bat')
exec.exec( exec.exec(
sdkManager, sdkManager,