Run hook scripts even if a pkg.script isn't used.

Author: reid

lib/utils/lifecycle.js

@@ -13,36 +13,13 @@ function lifecycle (pkg, stage, cb) {
   while (pkg && pkg._data) pkg = pkg._data
   if (!pkg) return cb(new Error("Invalid package data"))
   log.verbose(pkg._id, "lifecycle "+stage)
-  if (!pkg.scripts || !(stage in pkg.scripts)) return cb()
 
-  // run package lifecycle scripts in the package root, or the nearest parent.
-  var d = path.join(npm.dir, pkg.name, pkg.version, "package")
-  while (d) {
-    try {
-      process.chdir(d)
-      break
-    } catch (ex) {
-      d = path.dirname(d)
-    }
-  }
-  log(pkg._id, stage)
-
-  // set the env variables, then run the script as a child process.
-  // NOTE: The env vars won't work until node supports env hashes for child procs
+  // set the env variables, then run scripts as a child process.
   var env = makeEnv(pkg)
   env.npm_lifecycle_event = stage
-  env.npm_lifecycle_script = pkg.scripts[stage]
   log.silly(env, "lifecycle env")
-  exec("sh", ["-c", env.npm_lifecycle_script], env, function (er) {
-    if (er && !npm.ROLLBACK) {
-      log("Failed to exec "+stage+" script", pkg._id)
-      er.message = pkg._id + " " + stage + ": `" + env.npm_lifecycle_script+"`\n"
-                 + er.message
-      return cb(er)
-    } else if (er) {
-      log.error(er, pkg._id+"."+stage+" failed")
-    }
-    // check for a hook script
+
+  function runHook () { // check for a hook script
     var hook = path.join(npm.dir, ".hooks", stage)
     fs.stat(hook, function (er) {
       if (er) return cb()
@@ -52,7 +29,38 @@ function lifecycle (pkg, stage, cb) {
         cb(er)
       })
     })
-  })
+  }
+
+  if (pkg.scripts && (stage in pkg.scripts)) {
+      // define the lifecycle script, since it exists.
+      // this will also be available in runHook
+      env.npm_lifecycle_script = pkg.scripts[stage]
+
+      // run package lifecycle scripts in the package root, or the nearest parent.
+      var d = path.join(npm.dir, pkg.name, pkg.version, "package")
+      while (d) {
+        try {
+          process.chdir(d)
+          break
+        } catch (ex) {
+          d = path.dirname(d)
+        }
+      }
+      log(pkg._id, stage)
+
+      exec("sh", ["-c", env.npm_lifecycle_script], env, function (er) {
+        if (er && !npm.ROLLBACK) {
+          log("Failed to exec "+stage+" script", pkg._id)
+          er.message = pkg._id + " " + stage + ": `" + env.npm_lifecycle_script+"`\n"
+                     + er.message
+          return cb(er)
+        } else if (er) {
+          log.error(er, pkg._id+"."+stage+" failed")
+        }
+        runHook()
+      })
+  } else runHook() // try to run a hook script even
+                   // if a pkg.script isn't defined
 }
 
 function makeEnv (data, prefix, env) {