From 0924654a479a2ac60425ccfd8ae75e82bc2750a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=82=A8=E3=83=AA=E3=82=B9?= Date: Tue, 21 Jan 2020 23:37:22 +0900 Subject: [PATCH] fix (adb): shell to return expected stdout (#904) --- bin/templates/cordova/lib/Adb.js | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/bin/templates/cordova/lib/Adb.js b/bin/templates/cordova/lib/Adb.js index 965b4f3e..042a0c2a 100644 --- a/bin/templates/cordova/lib/Adb.js +++ b/bin/templates/cordova/lib/Adb.js @@ -83,10 +83,9 @@ Adb.shell = function (target, shellCommand) { events.emit('verbose', 'Running adb shell command "' + shellCommand + '" on target ' + target + '...'); var args = ['-s', target, 'shell']; shellCommand = shellCommand.split(/\s+/); - return execa('adb', args.concat(shellCommand), { cwd: os.tmpdir() }).catch((error) => { - return Promise.reject(new CordovaError('Failed to execute shell command "' + - shellCommand + '"" on device: ' + error)); - }); + return execa('adb', args.concat(shellCommand), { cwd: os.tmpdir() }) + .then(({ stdout }) => stdout) + .catch(error => Promise.reject(new CordovaError(`Failed to execute shell command "${shellCommand}" on device: ${error}`))); }; Adb.start = function (target, activityName) {