Pass a flag through to say whether it's an npat script call

beefsack · Jan 8, 2012 · bb89c59 · bb89c59
1 parent e6173a8
commit bb89c59
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 8 deletions.
diff --git a/lib/build.js b/lib/build.js
@@ -55,7 +55,7 @@ function build_ (global, didPre, didRB) { return function (folder, cb) {
         , didPre !== build._noLC && [lifecycle, pkg, "postinstall", folder]
         , didPre !== build._noLC
           && npm.config.get("npat")
-          && [lifecycle, pkg, "test", folder] ]
+          && [lifecycle, pkg, "test", folder, false, false, true] ]
       , cb )
   })
 }}

diff --git a/lib/utils/lifecycle.js b/lib/utils/lifecycle.js
@@ -12,7 +12,8 @@ var log = require("./log.js")
   , constants = require("constants")
   , output = require("./output.js")
 
-function lifecycle (pkg, stage, wd, unsafe, failOk, cb) {
+function lifecycle (pkg, stage, wd, unsafe, failOk, isNpat, cb) {
+  if (typeof cb !== "function") cb = isNpat, isNpat = false
   if (typeof cb !== "function") cb = failOk, failOk = false
   if (typeof cb !== "function") cb = unsafe, unsafe = false
   if (typeof cb !== "function") cb = wd, wd = null
@@ -42,7 +43,7 @@ function lifecycle (pkg, stage, wd, unsafe, failOk, cb) {
     // even if it's never used, sh freaks out.
     if (!npm.config.get("unsafe-perm")) env.TMPDIR = wd
 
-    lifecycle_(pkg, stage, wd, env, unsafe, failOk, cb)
+    lifecycle_(pkg, stage, wd, env, unsafe, failOk, isNpat, cb)
   })
 }
 
@@ -53,7 +54,7 @@ function checkForLink (pkg, cb) {
   })
 }
 
-function lifecycle_ (pkg, stage, wd, env, unsafe, failOk, cb) {
+function lifecycle_ (pkg, stage, wd, env, unsafe, failOk, isNpat, cb) {
   var PATH = []
     , p = wd.split("node_modules")
     , acc = path.resolve(p.shift())
@@ -87,7 +88,7 @@ function lifecycle_ (pkg, stage, wd, env, unsafe, failOk, cb) {
   }
 
   chain
-    ( [ packageLifecycle && [runPackageLifecycle, pkg, env, wd, unsafe]
+    ( [ packageLifecycle && [runPackageLifecycle, pkg, env, wd, unsafe, isNpat]
       , [runHookLifecycle, pkg, env, wd, unsafe] ]
     , cb )
 }
@@ -105,15 +106,15 @@ function validWd (d, cb) {
   })
 }
 
-function runPackageLifecycle (pkg, env, wd, unsafe, cb) {
+function runPackageLifecycle (pkg, env, wd, unsafe, isNpat, cb) {
   // run package lifecycle scripts in the package root, or the nearest parent.
   var stage = env.npm_lifecycle_event
     , user = unsafe ? null : npm.config.get("user")
     , group = unsafe ? null : npm.config.get("group")
     , cmd = env.npm_lifecycle_script
     , sh = "sh"
     , shFlag = "-c"
-  
+
   if (process.platform === "win32") {
     sh = "cmd"
     shFlag = "/c"
@@ -123,10 +124,15 @@ function runPackageLifecycle (pkg, env, wd, unsafe, cb) {
 
   output.write("\n> "+pkg._id+" " + stage+" "+wd+"\n> "+cmd+"\n", function (er) {
     if (er) return cb(er)
-    
+
     exec( sh, [shFlag, cmd], env, true, wd
         , user, group
         , function (er, code, stdout, stderr) {
+
+      if (isNpat) {
+        // XXX DTrejo, go nuts on this right here
+      }
+
       if (er && !npm.ROLLBACK) {
         log("Failed to exec "+stage+" script", pkg._id)
         er.message = pkg._id + " "