Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix extendEnv option not working with shell option #184

Merged
merged 6 commits into from Mar 6, 2019
Merged

Fix extendEnv option not working with shell option #184

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d826aff
Add test
ehmicky Mar 6, 2019
ad32480
Improve options parsing
ehmicky Mar 6, 2019
a242991
Fix Node 6 support
ehmicky Mar 6, 2019
f98712b
Fix Windows support
ehmicky Mar 6, 2019
3a537f0
Improve test
ehmicky Mar 6, 2019
67c4d91
Fix test titles
ehmicky Mar 6, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
41 changes: 18 additions & 23 deletions index.js
View file
Open in desktop
Expand Up @@ -14,27 +14,31 @@ const stdio = require('./lib/stdio');
const TEN_MEGABYTES = 1000 * 1000 * 10;

function handleArgs(command, args, options) {
options = Object.assign({
extendEnv: true,
env: {}
}, options);

if (options.extendEnv) {
options.env = Object.assign({}, process.env, options.env);
}

const parsed = crossSpawn._parse(command, args, options);
command = parsed.command;
args = parsed.args;
options = parsed.options;

options = Object.assign({
maxBuffer: TEN_MEGABYTES,
buffer: true,
stripFinalNewline: true,
preferLocal: true,
localDir: parsed.options.cwd || process.cwd(),
localDir: options.cwd || process.cwd(),
encoding: 'utf8',
reject: true,
cleanup: true
}, parsed.options, {windowsHide: true});
}, options, {
windowsHide: true
});

if (options.extendEnv !== false) {
options.env = Object.assign({}, process.env, options.env);
}

if (options.preferLocal) {
options.env = npmRunPath.env(Object.assign({}, options, {cwd: options.localDir}));
}

// TODO: Remove in the next major release
if (options.stripEof === false) {
Expand All @@ -43,26 +47,17 @@ function handleArgs(command, args, options) {

options.stdio = stdio(options);

if (options.preferLocal) {
options.env = npmRunPath.env(Object.assign({}, options, {cwd: options.localDir}));
}

if (options.detached) {
// #115
options.cleanup = false;
}

if (process.platform === 'win32' && path.basename(parsed.command) === 'cmd.exe') {
if (process.platform === 'win32' && path.basename(command) === 'cmd.exe') {
// #116
parsed.args.unshift('/q');
args.unshift('/q');
}

return {
command: parsed.command,
args: parsed.args,
options,
parsed
};
return {command, args, options, parsed};
}

function handleInput(spawned, input) {
Expand Down
10 changes: 9 additions & 1 deletion test.js
View file
Open in desktop
Expand Up @@ -478,7 +478,7 @@ test('extend environment variables by default', async t => {
]);
});

test('do not extend environment with `extendEnv` option', async t => {
test('do not extend environment with `extendEnv: false`', async t => {
const result = await m.stdout('environment', [], {env: {BAR: 'bar', PATH: process.env.PATH}, extendEnv: false});

t.deepEqual(result.split('\n'), [
Expand All @@ -487,6 +487,14 @@ test('do not extend environment with `extendEnv` option', async t => {
]);
});

test('use extend environment with `extendEnv: true` and `shell: true`', async t => {
process.env.TEST = 'test';
const command = process.platform === 'win32' ? 'echo %TEST%' : 'echo $TEST';
const stdout = await m.stdout(command, {shell: true, env: {}, extendEnv: true});
t.is(stdout, 'test');
delete process.env.TEST;
});

test('do not buffer when streaming', async t => {
const result = await getStream(m('max-buffer', ['stdout', '21'], {maxBuffer: 10}).stdout);

Expand Down