[pull] master from atom:master

script/bootstrap

@@ -2,7 +2,6 @@
 
 'use strict'
 
-const path = require('path')
 const CONFIG = require('./config')
 const childProcess = require('child_process')
 const cleanDependencies = require('./lib/clean-dependencies')

script/config.js

@@ -54,6 +54,7 @@ module.exports = {
   homeDirPath,
   getApmBinPath,
   getNpmBinPath,
+  getLocalNpmBinPath,
   snapshotAuxiliaryData: {}
 };
 
@@ -111,7 +112,11 @@ function getApmBinPath() {
   );
 }
 
-function getNpmBinPath(external = false) {
+function getNpmBinPath() {
+  return process.platform === 'win32' ? 'npm.cmd' : 'npm';
+}
+
+function getLocalNpmBinPath() {
   const npmBinName = process.platform === 'win32' ? 'npm.cmd' : 'npm';
   const localNpmBinPath = path.resolve(
     repositoryRootPath,

script/lib/install-apm.js

@@ -12,7 +12,7 @@ module.exports = function(ci) {
   }
   console.log('Installing apm');
   childProcess.execFileSync(
-    CONFIG.getNpmBinPath(),
+    CONFIG.getLocalNpmBinPath(),
     ['--global-style', '--loglevel=error', ci ? 'ci' : 'install'],
     { env: process.env, cwd: CONFIG.apmRootPath }
   );

script/lib/install-script-dependencies.js

@@ -9,9 +9,8 @@ process.env.ELECTRON_CUSTOM_VERSION = CONFIG.appMetadata.electronVersion;
 
 module.exports = function(ci) {
   console.log('Installing script dependencies');
-  const npmBinName = process.platform === 'win32' ? 'npm.cmd' : 'npm';
   childProcess.execFileSync(
-    npmBinName,
+    CONFIG.getNpmBinPath(ci),
     ['--loglevel=error', ci ? 'ci' : 'install'],
     { env: process.env, cwd: CONFIG.scriptRootPath }
   );