diff options
| author | Timothy J Fontaine <tjfontaine@gmail.com> | 2014-01-22 08:42:05 -0800 |
|---|---|---|
| committer | Timothy J Fontaine <tjfontaine@gmail.com> | 2014-01-22 08:42:05 -0800 |
| commit | fdc3cc9d7a2d1e12c74fc0c0939d22f40e58b52b (patch) | |
| tree | 0e73ef7de9054f7d9b2fe90a5aec9ad072716865 /deps/npm/lib/utils/lifecycle.js | |
| parent | 6514a4128c3e7aa6c1bb1c6f3f018412fa76e5d9 (diff) | |
| parent | 25f9e92813eda927c3d3eaa56dab3a397afadebe (diff) | |
| download | node-merge-test.tar.gz | |
Merge remote-tracking branch 'upstream/v0.10'merge-test
Conflicts:
node.gyp
Diffstat (limited to 'deps/npm/lib/utils/lifecycle.js')
| -rw-r--r-- | deps/npm/lib/utils/lifecycle.js | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/deps/npm/lib/utils/lifecycle.js b/deps/npm/lib/utils/lifecycle.js index ffa6484fa..e6ef925b3 100644 --- a/deps/npm/lib/utils/lifecycle.js +++ b/deps/npm/lib/utils/lifecycle.js @@ -185,14 +185,6 @@ function runCmd_ (cmd, pkg, env, wd, stage, unsafe, uid, gid, cb_) { process.nextTick(dequeue) } - var sh = "sh" - var shFlag = "-c" - - if (process.platform === "win32") { - sh = "cmd" - shFlag = "/c" - } - var conf = { cwd: wd , env: env , stdio: [ 0, 1, 2 ] @@ -203,6 +195,15 @@ function runCmd_ (cmd, pkg, env, wd, stage, unsafe, uid, gid, cb_) { conf.gid = gid ^ 0 } + var sh = "sh" + var shFlag = "-c" + + if (process.platform === "win32") { + sh = "cmd" + shFlag = "/c" + conf.windowsVerbatimArguments = true + } + var proc = spawn(sh, [shFlag, cmd], conf) proc.on("close", function (code, signal) { if (signal) { |