Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 1 addition & 6 deletions bin/shjs
Original file line number Diff line number Diff line change
Expand Up @@ -34,12 +34,7 @@ if (!test('-f', scriptName)) {
}

args = process.argv.slice(3);

for (var i = 0, l = args.length; i < l; i++) {
if (args[i][0] !== "-"){
args[i] = '"' + args[i] + '"'; // fixes arguments with multiple words
}
}
process.argv = [process.argv[0], process.argv[1], ...args];

var path = require('path');
var extensions = require('interpret').extensions;
Expand Down
1 change: 1 addition & 0 deletions test/resources/shjs/echo-args.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
console.log(...process.argv);
17 changes: 15 additions & 2 deletions test/shjs.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,19 @@ const shell = require('shelljs');

const binPath = path.resolve(__dirname, '../bin/shjs');

function runWithShjs(name) {
function runWithShjs(name, ...args) {
// prefix with 'node ' for Windows, don't prefix for unix
const execPath = process.platform === 'win32'
? `${JSON.stringify(shell.config.execPath)} `
: '';
const script = path.resolve(__dirname, 'resources', 'shjs', name);
return shell.exec(`${execPath}${binPath} ${script}`, { silent: true });
let argString = args.map(arg => JSON.stringify(arg)).join(' ');
if (argString) {
argString = ' ' + argString;
}
return shell.exec(`${execPath}${binPath} ${script}${argString}`, {
silent: true
});
}

//
Expand Down Expand Up @@ -61,6 +67,13 @@ test('CoffeeScript extension inference', t => {
t.falsy(result.stderr);
});

test('Multiple arguments', t => {
const result = runWithShjs('echo-args.js', 'hello', 'there');
t.is(result.code, 0);
t.regex(result.stdout, /hello there\n$/);
t.falsy(result.stderr);
});

//
// Invalids
//
Expand Down