Skip to content

Commit 36562ea

Browse files
committed
Install using npm installed during installation of script dependencies
1 parent eb6258f commit 36562ea

File tree

3 files changed

+4
-8
lines changed

3 files changed

+4
-8
lines changed

script/config.js

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ function getAppName(channel) {
7777
return channel === 'stable'
7878
? 'Atom'
7979
: `Atom ${process.env.ATOM_CHANNEL_DISPLAY_NAME ||
80-
channel.charAt(0).toUpperCase() + channel.slice(1)}`;
80+
channel.charAt(0).toUpperCase() + channel.slice(1)}`;
8181
}
8282

8383
function getExecutableName(channel, appName) {
@@ -113,8 +113,6 @@ function getApmBinPath() {
113113
}
114114

115115
function getNpmBinPath(external = false) {
116-
if (process.env.NPM_BIN_PATH) return process.env.NPM_BIN_PATH;
117-
118116
const npmBinName = process.platform === 'win32' ? 'npm.cmd' : 'npm';
119117
const localNpmBinPath = path.resolve(
120118
repositoryRootPath,
@@ -123,7 +121,5 @@ function getNpmBinPath(external = false) {
123121
'.bin',
124122
npmBinName
125123
);
126-
return !external && fs.existsSync(localNpmBinPath)
127-
? localNpmBinPath
128-
: npmBinName;
124+
return localNpmBinPath;
129125
}

script/lib/install-script-dependencies.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ process.env.ELECTRON_CUSTOM_VERSION = CONFIG.appMetadata.electronVersion;
1010
module.exports = function(ci) {
1111
console.log('Installing script dependencies');
1212
childProcess.execFileSync(
13-
CONFIG.getNpmBinPath(ci),
13+
'npm',
1414
['--loglevel=error', ci ? 'ci' : 'install'],
1515
{ env: process.env, cwd: CONFIG.scriptRootPath }
1616
);

script/lib/verify-machine-requirements.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ const CONFIG = require('../config');
77

88
module.exports = function(ci) {
99
verifyNode();
10-
verifyNpm(ci);
10+
// verifyNpm(ci);
1111
verifyPython();
1212
};
1313

0 commit comments

Comments
 (0)