From fb3c06d709a47f23c173b336a2a3b23d075dffb4 Mon Sep 17 00:00:00 2001 From: Yang Date: Fri, 3 Jul 2020 16:14:01 +1000 Subject: [PATCH] Use fs for writing licence files. --- lib/sdk-installer.js | 4 ++-- src/sdk-installer.ts | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/sdk-installer.js b/lib/sdk-installer.js index 67e35bc6..4d5a73f4 100644 --- a/lib/sdk-installer.js +++ b/lib/sdk-installer.js @@ -46,12 +46,12 @@ function installAndroidSdk(apiLevel, target, arch, emulatorBuild, ndkVersion, cm // additional permission and license requirements for Linux const sdkPreviewLicensePath = `${process.env.ANDROID_HOME}/licenses/android-sdk-preview-license`; if (!isOnMac && !fs.existsSync(sdkPreviewLicensePath)) { - yield exec.exec(`sh -c \\"echo -e '\n84831b9409646a918e30573bab4c9c91346d8abd' > ${sdkPreviewLicensePath}"`); + fs.writeFileSync(sdkPreviewLicensePath, '\n84831b9409646a918e30573bab4c9c91346d8abd'); } // license required for API 30 system images const sdkArmDbtLicensePath = `${process.env.ANDROID_HOME}/licenses/android-sdk-arm-dbt-license`; if (apiLevel == 30 && !fs.existsSync(sdkArmDbtLicensePath)) { - yield exec.exec(`sh -c \\"echo -e '\n859f317696f67ef3d7f30a50a5560e7834b43903' > ${sdkArmDbtLicensePath}"`); + fs.writeFileSync(sdkArmDbtLicensePath, '\n859f317696f67ef3d7f30a50a5560e7834b43903'); } console.log('Installing latest build tools, platform tools, and platform.'); yield exec.exec(`sh -c \\"sdkmanager --install 'build-tools;${BUILD_TOOLS_VERSION}' platform-tools 'platforms;android-${apiLevel}' > /dev/null"`); diff --git a/src/sdk-installer.ts b/src/sdk-installer.ts index e9222504..38706110 100644 --- a/src/sdk-installer.ts +++ b/src/sdk-installer.ts @@ -34,13 +34,13 @@ export async function installAndroidSdk(apiLevel: number, target: string, arch: // additional permission and license requirements for Linux const sdkPreviewLicensePath = `${process.env.ANDROID_HOME}/licenses/android-sdk-preview-license`; if (!isOnMac && !fs.existsSync(sdkPreviewLicensePath)) { - await exec.exec(`sh -c \\"echo -e '\n84831b9409646a918e30573bab4c9c91346d8abd' > ${sdkPreviewLicensePath}"`); + fs.writeFileSync(sdkPreviewLicensePath, '\n84831b9409646a918e30573bab4c9c91346d8abd'); } // license required for API 30 system images const sdkArmDbtLicensePath = `${process.env.ANDROID_HOME}/licenses/android-sdk-arm-dbt-license`; if (apiLevel == 30 && !fs.existsSync(sdkArmDbtLicensePath)) { - await exec.exec(`sh -c \\"echo -e '\n859f317696f67ef3d7f30a50a5560e7834b43903' > ${sdkArmDbtLicensePath}"`); + fs.writeFileSync(sdkArmDbtLicensePath, '\n859f317696f67ef3d7f30a50a5560e7834b43903'); } console.log('Installing latest build tools, platform tools, and platform.');