mirror of
https://github.com/apache/cordova-android.git
synced 2025-01-31 17:32:51 +08:00
fix (adb): shell to return expected stdout (#904)
This commit is contained in:
parent
8ef742e79d
commit
0924654a47
7
bin/templates/cordova/lib/Adb.js
vendored
7
bin/templates/cordova/lib/Adb.js
vendored
@ -83,10 +83,9 @@ Adb.shell = function (target, shellCommand) {
|
|||||||
events.emit('verbose', 'Running adb shell command "' + shellCommand + '" on target ' + target + '...');
|
events.emit('verbose', 'Running adb shell command "' + shellCommand + '" on target ' + target + '...');
|
||||||
var args = ['-s', target, 'shell'];
|
var args = ['-s', target, 'shell'];
|
||||||
shellCommand = shellCommand.split(/\s+/);
|
shellCommand = shellCommand.split(/\s+/);
|
||||||
return execa('adb', args.concat(shellCommand), { cwd: os.tmpdir() }).catch((error) => {
|
return execa('adb', args.concat(shellCommand), { cwd: os.tmpdir() })
|
||||||
return Promise.reject(new CordovaError('Failed to execute shell command "' +
|
.then(({ stdout }) => stdout)
|
||||||
shellCommand + '"" on device: ' + error));
|
.catch(error => Promise.reject(new CordovaError(`Failed to execute shell command "${shellCommand}" on device: ${error}`)));
|
||||||
});
|
|
||||||
};
|
};
|
||||||
|
|
||||||
Adb.start = function (target, activityName) {
|
Adb.start = function (target, activityName) {
|
||||||
|
Loading…
Reference in New Issue
Block a user