lifecycle: prefer current node in run-script

Fixes: #11175 Fixes: #9253 PR-URL: #11204 Credit: @segrey Reviewed-By: @iarna
npm · Jan 28, 2016 · 3eae40b · 3eae40b
1 parent f427934
commit 3eae40b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/lib/utils/lifecycle.js b/lib/utils/lifecycle.js
@@ -90,6 +90,9 @@ function lifecycle_ (pkg, stage, wd, env, unsafe, failOk, cb) {
   // the bundled one will be used for installing things.
   pathArr.unshift(path.join(__dirname, '..', '..', 'bin', 'node-gyp-bin'))
 
+  // prefer current node interpreter in child scripts
+  pathArr.push(path.dirname(process.execPath))
+
   if (env[PATH]) pathArr.push(env[PATH])
   env[PATH] = pathArr.join(process.platform === 'win32' ? ';' : ':')
 

diff --git a/test/tap/lifecycle-path.js b/test/tap/lifecycle-path.js
@@ -67,7 +67,8 @@ test('make sure the path is correct', function (t) {
     // get the ones we tacked on, then the system-specific requirements
     var expect = [
       '{{ROOT}}/bin/node-gyp-bin',
-      '{{ROOT}}/test/tap/lifecycle-path/node_modules/.bin'
+      '{{ROOT}}/test/tap/lifecycle-path/node_modules/.bin',
+      path.dirname(process.execPath)
     ].concat(PATH.split(pathSplit).map(function (p) {
       return p.replace(/\\/g, '/')
     }))