diff options
| author | Forrest L Norvell <forrest@npmjs.com> | 2015-01-17 00:50:09 -0800 |
|---|---|---|
| committer | Ben Noordhuis <info@bnoordhuis.nl> | 2015-01-18 13:51:49 +0100 |
| commit | 9dc8f59fea5a294df039f70e523be2d45aef1324 (patch) | |
| tree | 69fbaf54182ccf04626781d330ead12d185421bc /deps/npm/lib/run-script.js | |
| parent | e8ad773b56a94fad2cd8a454453a7214a8ce92d1 (diff) | |
| download | android-node-v8-9dc8f59fea5a294df039f70e523be2d45aef1324.tar.gz android-node-v8-9dc8f59fea5a294df039f70e523be2d45aef1324.tar.bz2 android-node-v8-9dc8f59fea5a294df039f70e523be2d45aef1324.zip | |
deps: upgrade npm to 2.2.0
PR-URL: https://github.com/iojs/io.js/pull/479
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Rod Vagg <rod@vagg.org>
Diffstat (limited to 'deps/npm/lib/run-script.js')
| -rw-r--r-- | deps/npm/lib/run-script.js | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/deps/npm/lib/run-script.js b/deps/npm/lib/run-script.js index fd26a0c43b..ce8ea0f13a 100644 --- a/deps/npm/lib/run-script.js +++ b/deps/npm/lib/run-script.js @@ -125,9 +125,17 @@ function run (pkg, wd, cmd, args, cb) { } else { if (!pkg.scripts[cmd]) { if (cmd === "test") { - pkg.scripts.test = "echo \"Error: no test specified\""; + pkg.scripts.test = "echo \"Error: no test specified\"" + } else if (cmd === "env") { + if (process.platform === "win32") { + log.verbose("run-script using default platform env: SET (Windows)") + pkg.scripts[cmd] = "SET" + } else { + log.verbose("run-script using default platform env: env (Unix)") + pkg.scripts[cmd] = "env" + } } else { - return cb(new Error("missing script: " + cmd)); + return cb(new Error("missing script: " + cmd)) } } cmds = [cmd] @@ -140,7 +148,9 @@ function run (pkg, wd, cmd, args, cb) { log.verbose("run-script", cmds) chain(cmds.map(function (c) { // pass cli arguments after -- to script. - if (pkg.scripts[c] && c === cmd) pkg.scripts[c] = pkg.scripts[c] + joinArgs(args) + if (pkg.scripts[c] && c === cmd) { + pkg.scripts[c] = pkg.scripts[c] + joinArgs(args) + } // when running scripts explicitly, assume that they're trusted. return [lifecycle, pkg, c, wd, true] |