npm: Upgrade to v2.1.6

1 files changed, 21 insertions, 12 deletions

diff --git a/deps/npm/lib/run-script.js b/deps/npm/lib/run-script.js
index 6cb7bf7fb9..4495b93c48 100644
--- a/deps/npm/lib/run-script.js
+++ b/deps/npm/lib/run-script.js
@@ -53,7 +53,10 @@ runScript.completion = function (opts, cb) {
     next()
   })
 
-  if (npm.config.get("global")) scripts = [], next()
+  if (npm.config.get("global")) {
+    scripts = []
+    next()
+  }
   else readJson(path.join(npm.localPrefix, "package.json"), function (er, d) {
     if (er && er.code !== "ENOENT" && er.code !== "ENOTDIR") return cb(er)
     d = d || {}
@@ -63,7 +66,8 @@ runScript.completion = function (opts, cb) {
 
   function next () {
     if (!installed || !scripts) return
-    return cb(null, scripts.concat(installed))
+
+    cb(null, scripts.concat(installed))
   }
 }
 
@@ -80,9 +84,9 @@ function runScript (args, cb) {
 }
 
 function list(cb) {
-  var json = path.join(npm.localPrefix, 'package.json')
+  var json = path.join(npm.localPrefix, "package.json")
   return readJson(json, function(er, d) {
-    if (er && er.code !== 'ENOENT' && er.code !== 'ENOTDIR') return cb(er)
+    if (er && er.code !== "ENOENT" && er.code !== "ENOTDIR") return cb(er)
     if (er) d = {}
     var scripts = Object.keys(d.scripts || {})
 
@@ -110,22 +114,27 @@ function list(cb) {
 }
 
 function run (pkg, wd, cmd, args, cb) {
-  var cmds = []
   if (!pkg.scripts) pkg.scripts = {}
+
+  var cmds
   if (cmd === "restart") {
-    cmds = ["prestop","stop","poststop"
-           ,"restart"
-           ,"prestart","start","poststart"]
+    cmds = [
+      "prestop", "stop", "poststop",
+      "restart",
+      "prestart", "start", "poststart"
+    ]
   } else {
     cmds = [cmd]
   }
+
   if (!cmd.match(/^(pre|post)/)) {
     cmds = ["pre"+cmd].concat(cmds).concat("post"+cmd)
   }
+
   log.verbose("run-script", cmds)
   chain(cmds.map(function (c) {
     // pass cli arguments after -- to script.
-    if (pkg.scripts[c]) 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]
@@ -135,10 +144,10 @@ function run (pkg, wd, cmd, args, cb) {
 // join arguments after '--' and pass them to script,
 // handle special characters such as ', ", ' '.
 function joinArgs (args) {
-  var joinedArgs = ''
-  args.forEach(function(arg, i) {
+  var joinedArgs = ""
+  args.forEach(function(arg) {
     if (arg.match(/[ '"]/)) arg = '"' + arg.replace(/"/g, '\\"') + '"'
-    joinedArgs += ' ' + arg
+    joinedArgs += " " + arg
   })
   return joinedArgs
 }