diff --git a/lib/emulator-manager.js b/lib/emulator-manager.js index 92207d33..bd642c92 100644 --- a/lib/emulator-manager.js +++ b/lib/emulator-manager.js @@ -1,9 +1,10 @@ "use strict"; var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) { + function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); } return new (P || (P = Promise))(function (resolve, reject) { function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } } function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } } - function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); } + function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); } step((generator = generator.apply(thisArg, _arguments || [])).next()); }); }; diff --git a/lib/main.js b/lib/main.js index 5d0eff01..ad16ab9f 100644 --- a/lib/main.js +++ b/lib/main.js @@ -1,9 +1,10 @@ "use strict"; var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) { + function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); } return new (P || (P = Promise))(function (resolve, reject) { function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } } function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } } - function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); } + function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); } step((generator = generator.apply(thisArg, _arguments || [])).next()); }); }; @@ -54,16 +55,18 @@ function run() { const disableAnimations = disableAnimationsInput === 'true'; console.log(`disable animations: ${disableAnimations}`); // custom scrpt to run - const scriptInput = core.getInput('script', { required: true }); - const commands = scriptInput.split(/\r?\n/); + const script = core.getInput('script', { required: true }); // install SDK yield sdk_installer_1.installAndroidSdk(apiLevel, target, arch); // launch an emulator yield emulator_manager_1.launchEmulator(apiLevel, target, arch, profile, headless, disableAnimations); // execute the custom script - commands.forEach((command) => __awaiter(this, void 0, void 0, function* () { - yield exec.exec(`${command}`); - })); + try { + yield exec.exec(`${script}`); + } + catch (error) { + console.error(error.message); + } // finally kill the emulator yield emulator_manager_1.killEmulator(); } diff --git a/lib/sdk-installer.js b/lib/sdk-installer.js index db55c27f..45f778ed 100644 --- a/lib/sdk-installer.js +++ b/lib/sdk-installer.js @@ -1,9 +1,10 @@ "use strict"; var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) { + function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); } return new (P || (P = Promise))(function (resolve, reject) { function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } } function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } } - function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); } + function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); } step((generator = generator.apply(thisArg, _arguments || [])).next()); }); }; diff --git a/src/main.ts b/src/main.ts index 042d7114..e8a82fa0 100644 --- a/src/main.ts +++ b/src/main.ts @@ -44,8 +44,7 @@ async function run() { console.log(`disable animations: ${disableAnimations}`); // custom scrpt to run - const scriptInput = core.getInput('script', { required: true }); - const commands = scriptInput.split(/\r?\n/); + const script = core.getInput('script', { required: true }); // install SDK await installAndroidSdk(apiLevel, target, arch); @@ -54,9 +53,11 @@ async function run() { await launchEmulator(apiLevel, target, arch, profile, headless, disableAnimations); // execute the custom script - commands.forEach(async command => { - await exec.exec(`${command}`); - }); + try { + await exec.exec(`${script}`); + } catch (error) { + console.error(error.message); + } // finally kill the emulator await killEmulator();