Applying patch provided by @TimothyGu

TimothyGu · nfischer · commit cebcb6c79bc9 · 2016-03-10T16:52:27.000-08:00
diff --git a/bin/shjs b/bin/shjs
@@ -36,4 +36,4 @@ var path = require('path');
 var extensions = require('interpret').extensions;
 var rechoir = require('rechoir');
 rechoir.prepare(extensions, scriptName);
-require(require.resolve(path.join(process.cwd(), scriptName)));
+require(require.resolve(path.resolve(process.cwd(), scriptName)));
diff --git a/test/shjs.js b/test/shjs.js
@@ -4,8 +4,8 @@ var assert = require('assert');
 
 function runScript(name) {
   // prefix with 'node ' for Windows, don't prefix for OSX/Linux
-  var cmd = (process.platform === 'win32' ? 'node' : '') + path.resolve(__dirname, '../bin/shjs');
-  var script = path.join('resources', 'shjs', name);
+  var cmd = (process.platform === 'win32' ? 'node ' : '') + path.resolve(__dirname, '../bin/shjs');
+  var script = path.resolve(__dirname, 'resources', 'shjs', name);
   return shell.exec(cmd + ' ' + script, { silent: true });
 }
 

Original file line number	Diff line number	Diff line change
`@@ -4,8 +4,8 @@ var assert = require('assert');`
`4`	`4`
`5`	`5`	`function runScript(name) {`
`6`	`6`	`// prefix with 'node ' for Windows, don't prefix for OSX/Linux`
`7`		`- var cmd = (process.platform === 'win32' ? 'node' : '') + path.resolve(__dirname, '../bin/shjs');`
`8`		`- var script = path.join('resources', 'shjs', name);`
	`7`	`+ var cmd = (process.platform === 'win32' ? 'node ' : '') + path.resolve(__dirname, '../bin/shjs');`
	`8`	`+ var script = path.resolve(__dirname, 'resources', 'shjs', name);`
`9`	`9`	`return shell.exec(cmd + ' ' + script, { silent: true });`
`10`	`10`	`}`
`11`	`11`