archive-gh-me/shelljs
1
0
Fork 0
mirror of https://github.com/shelljs/shelljs.git synced 2026-01-18 16:03:37 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #348 from shelljs/test-exec-shell-option

Browse Source 
fix(exec): now actually supports shell option
This commit is contained in:
Nate Fischer 2016-02-13 20:51:21 -08:00
commit 3cd360c77d
2 changed files with 30 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/exec.js
View File

@ -65,11 +65,14 @@ function execSync(cmd, opts) {
var execCommand = '"'+process.execPath+'" '+scriptFile;
var script;
opts.cwd = path.resolve(opts.cwd);
var optString = JSON.stringify(opts);
if (typeof child.execSync === 'function') {
script = [
"var child = require('child_process')",
" , fs = require('fs');",
"var childProcess = child.exec('"+escape(cmd)+"', {env: process.env, maxBuffer: "+opts.maxBuffer+"}, function(err) {",
"var childProcess = child.exec('"+escape(cmd)+"', "+optString+", function(err) {",
" fs.writeFileSync('"+escape(codeFile)+"', err ? err.code.toString() : '0');",
"});",
"var stdoutStream = fs.createWriteStream('"+escape(stdoutFile)+"');",
@ -101,7 +104,7 @@ function execSync(cmd, opts) {
script = [
"var child = require('child_process')",
" , fs = require('fs');",
"var childProcess = child.exec('"+escape(cmd)+"', {env: process.env, maxBuffer: "+opts.maxBuffer+"}, function(err) {",
"var childProcess = child.exec('"+escape(cmd)+"', "+optString+", function(err) {",
" fs.writeFileSync('"+escape(codeFile)+"', err ? err.code.toString() : '0');",
"});"
].join('\n');

25
test/exec.js
View File

@ -107,6 +107,31 @@ if (process.version >= 'v0.11') { // this option doesn't work on v0.10
assert.ok(shell.error());
}
// check process.env works
assert.ok(!shell.env.FOO);
shell.env.FOO = 'Hello world';
result = shell.exec(process.platform !== 'win32' ? 'echo $FOO' : 'echo %FOO%');
assert.ok(!shell.error());
assert.equal(result.code, 0);
assert.equal(result.stdout, 'Hello world' + os.EOL);
assert.equal(result.stderr, '');
// set shell option (TODO: add tests for Windows)
if (process.platform !== 'win32') {
result = shell.exec('echo $0');
assert.ok(!shell.error());
assert.equal(result.code, 0);
assert.equal(result.stdout, '/bin/sh\n'); // sh by default
var bashPath = shell.which('bash').trim();
// this option doesn't work on v0.10
if (bashPath && process.version >= 'v0.11') {
result = shell.exec('echo $0', {shell: '/bin/bash'});
assert.ok(!shell.error());
assert.equal(result.code, 0);
assert.equal(result.stdout, '/bin/bash\n');
}
}
//
// async
//