lifecycle: small tweaks to message

PR-URL: npm/npm#14334 Credit: @zkat Reviewed-By: @iarna Reviewed-By: @addaleax
degouville · Oct 19, 2016 · 6a7d375 · 6a7d375
1 parent e16c14a
commit 6a7d375
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 9 deletions.
diff --git a/lib/utils/lifecycle.js b/lib/utils/lifecycle.js
@@ -149,7 +149,7 @@ function shouldPrependCurrentNodeDirToPATH () {
   var isDifferentNodeInPath
 
   var isWindows = process.platform === 'win32'
-  var foundExecPath = '(none)'
+  var foundExecPath
   try {
     foundExecPath = which.sync(path.basename(process.execPath), {pathExt: isWindows ? ';' : ':'})
     isDifferentNodeInPath = process.execPath.toUpperCase() !== foundExecPath.toUpperCase()
@@ -159,9 +159,11 @@ function shouldPrependCurrentNodeDirToPATH () {
 
   if (cfgsetting === 'warn-only') {
     if (isDifferentNodeInPath && !shouldPrependCurrentNodeDirToPATH.hasWarned) {
-      log.warn('lifecycle', 'The node binary used for scripts is', foundExecPath,
-                            'but npm uses', process.execPath,
-                            'itself. You may want to take a look at npm’s --scripts-prepend-node-path option.')
+      if (foundExecPath) {
+        log.warn('lifecycle', 'The node binary used for scripts is', foundExecPath, 'but npm is using', process.execPath, 'itself. Use the `--scripts-prepend-node-path` option to include the path for the node binary npm was executed with.')
+      } else {
+        log.warn('lifecycle', 'npm is using', process.execPath, 'but there is no node binary in the current PATH. Use the `--scripts-prepend-node-path` option to include the path for the node binary npm was executed with.')
+      }
       shouldPrependCurrentNodeDirToPATH.hasWarned = true
     }
 

diff --git a/test/tap/lifecycle-path.js b/test/tap/lifecycle-path.js
@@ -118,11 +118,8 @@ function checkPath (withDirOfCurrentNode, prependNodePathSetting, t) {
 
     if (prependNodePathSetting === 'warn-only') {
       if (withDirOfCurrentNode) {
-        t.match(stderr, new RegExp(
-          'npm WARN lifecycle The node binary used for scripts is \\(none\\) ' +
-          'but npm uses .*test.tap.lifecycle-path.node-bin.my_bundled_node(.exe)? ' +
-          'itself.'
-        ))
+        t.match(stderr, /npm WARN lifecycle/, 'spit out a warning')
+        t.match(stderr, /npm is using .*test.tap.lifecycle-path.node-bin.my_bundled_node(.exe)?/, 'mention the path of the binary npm itself is using.')
       } else {
         t.same(stderr, '')
       }