1berry/nodejs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

child_process: use /system/bin/sh on android

Browse Source 
`/bin/sh` does not exist on Android but `/system/bin/sh` does.

PR-URL: https://github.com/nodejs/node/pull/6745
Refs: https://github.com/nodejs/node/pull/6733
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Myles Borins <myles.borins@gmail.com>
This commit is contained in:
Ben Noordhuis 2016-05-13 22:24:12 +02:00
parent 1a0c80a1da
commit f4f6c6e815
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/child_process.js
View File

@ -332,7 +332,12 @@ function normalizeSpawnArguments(file /*, args, options*/) {
args = ['/s', '/c', '"' + command + '"']; args = ['/s', '/c', '"' + command + '"'];
options.windowsVerbatimArguments = true; options.windowsVerbatimArguments = true;
} else { } else {
file = typeof options.shell === 'string' ? options.shell : '/bin/sh'; if (typeof options.shell === 'string')
file = options.shell;
else if (process.platform === 'android')
file = '/system/bin/sh';
else
file = '/bin/sh';
args = ['-c', command]; args = ['-c', command];
} }
} }