From fe088ba16a35b8f3faf584f576bb32becb21a752 Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Tue, 10 Jun 2014 11:45:11 -0700 Subject: [PATCH] Use local npm version when available --- script/utils/verify-requirements.js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/script/utils/verify-requirements.js b/script/utils/verify-requirements.js index 0f240b3d8..148fa2384 100644 --- a/script/utils/verify-requirements.js +++ b/script/utils/verify-requirements.js @@ -40,7 +40,12 @@ function verifyNode(cb) { } function verifyNpm(cb) { - childProcess.execFile('npm', ['-v'], { env: process.env }, function(err, stdout) { + var localNpmPath = path.resolve(__dirname, '..', '..', 'build', 'node_modules', '.bin', 'npm'); + if (process.platform === 'win32') + localNpmPath += ".cmd"; + var npmCommand = fs.existsSync(localNpmPath) ? localNpmPath : 'npm'; + + childProcess.execFile(npmCommand, ['-v'], { env: process.env }, function(err, stdout) { if (err) return cb("npm 1.4 is required to build Atom. An error (" + err + ") occured when checking the version.");