kotovalexarian-likes-github/jashkenas--coffeescript
1
0
Fork 0
mirror of https://github.com/jashkenas/coffeescript.git synced 2022-11-09 12:23:24 -05:00
Code Releases Activity

Fix child_process.fork patch

Browse source 
* Preserve `options` when called without `args`
  * Don't use `coffee` script as `execPath` (Fixes #2919)
This commit is contained in:
Marc Häfner 2013-12-24 02:05:53 +01:00
parent 308299fe04
commit a6891e4feb
2 changed files with 14 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
lib/coffee-script/register.js
View file

@ -51,19 +51,14 @@
fork = child_process.fork; fork = child_process.fork;
binary = require.resolve('../../bin/coffee'); binary = require.resolve('../../bin/coffee');
child_process.fork = function(path, args, options) { child_process.fork = function(path, args, options) {
var execPath; if (helpers.isCoffee(path)) {
if (args == null) {
args = [];
}
if (options == null) {
options = {};
}
execPath = helpers.isCoffee(path) ? binary : null;
if (!Array.isArray(args)) { if (!Array.isArray(args)) {
args = [];
options = args || {}; options = args || {};
args = [];
}
args = [path].concat(args);
path = binary;
} }
options.execPath || (options.execPath = execPath);
return fork(path, args, options); return fork(path, args, options);
}; };
} }

11
src/register.coffee
View file

@ -42,10 +42,11 @@ if require.extensions
if child_process if child_process
{fork} = child_process {fork} = child_process
binary = require.resolve '../../bin/coffee' binary = require.resolve '../../bin/coffee'
child_process.fork = (path, args = [], options = {}) -> child_process.fork = (path, args, options) ->
execPath = if helpers.isCoffee(path) then binary else null if helpers.isCoffee path
if not Array.isArray args unless Array.isArray args
args = []
options = args or {} options = args or {}
options.execPath or= execPath args = []
args = [path].concat args
path = binary
fork path, args, options fork path, args, options