From f3572f51f0c802199503295c0dec3ba5f5b36960 Mon Sep 17 00:00:00 2001 From: Yang Date: Thu, 3 Sep 2020 01:13:19 +1000 Subject: [PATCH] WIP fix platform check. --- lib/sdk-installer.js | 6 +++--- src/sdk-installer.ts | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/sdk-installer.js b/lib/sdk-installer.js index 4c3c0dc0..a8d61823 100644 --- a/lib/sdk-installer.js +++ b/lib/sdk-installer.js @@ -44,8 +44,8 @@ const CMDLINE_TOOLS_URL_LINUX = 'https://dl.google.com/android/repository/comman */ function installAndroidSdk(apiLevel, target, arch, emulatorBuild, ndkVersion, cmakeVersion) { return __awaiter(this, void 0, void 0, function* () { - const IS_MAC = process.platform === 'win32'; - const IS_WINDOWS = process.platform === 'darwin'; + const IS_MAC = process.platform === 'darwin'; + const IS_WINDOWS = process.platform === 'win32'; const IS_LINUX = process.platform === 'linux'; if (IS_LINUX) { yield exec.exec(`sh -c \\"sudo chown $USER:$USER ${process.env.ANDROID_HOME} -R`); @@ -71,7 +71,7 @@ function installAndroidSdk(apiLevel, target, arch, emulatorBuild, ndkVersion, cm fs.writeFileSync(sdkArmDbtLicensePath, '\n859f317696f67ef3d7f30a50a5560e7834b43903'); } console.log('Installing latest build tools, platform tools, and platform.'); - const sdkmanagerExec = IS_WINDOWS ? 'sdkmanager.bat' : 'sdkmanagert'; + const sdkmanagerExec = IS_WINDOWS ? 'sdkmanager.bat' : 'sdkmanager'; yield exec.exec(`sh -c \\"${sdkmanagerExec} --install 'build-tools;${BUILD_TOOLS_VERSION}' platform-tools 'platforms;android-${apiLevel}' > /dev/null"`); if (emulatorBuild) { console.log(`Installing emulator build ${emulatorBuild}.`); diff --git a/src/sdk-installer.ts b/src/sdk-installer.ts index 6ebdb9e1..b70dd162 100644 --- a/src/sdk-installer.ts +++ b/src/sdk-installer.ts @@ -14,8 +14,8 @@ const CMDLINE_TOOLS_URL_LINUX = 'https://dl.google.com/android/repository/comman * and the system image for the chosen API level, CPU arch, and target. */ export async function installAndroidSdk(apiLevel: number, target: string, arch: string, emulatorBuild?: string, ndkVersion?: string, cmakeVersion?: string): Promise { - const IS_MAC = process.platform === 'win32'; - const IS_WINDOWS = process.platform === 'darwin'; + const IS_MAC = process.platform === 'darwin'; + const IS_WINDOWS = process.platform === 'win32'; const IS_LINUX = process.platform === 'linux'; if (IS_LINUX) { @@ -48,7 +48,7 @@ export async function installAndroidSdk(apiLevel: number, target: string, arch: console.log('Installing latest build tools, platform tools, and platform.'); - const sdkmanagerExec = IS_WINDOWS ? 'sdkmanager.bat' : 'sdkmanagert'; + const sdkmanagerExec = IS_WINDOWS ? 'sdkmanager.bat' : 'sdkmanager'; await exec.exec(`sh -c \\"${sdkmanagerExec} --install 'build-tools;${BUILD_TOOLS_VERSION}' platform-tools 'platforms;android-${apiLevel}' > /dev/null"`); if (emulatorBuild) {