mirror of
https://github.com/atom/atom.git
synced 2026-04-28 03:01:47 -04:00
Install using npm installed during installation of script dependencies
This commit is contained in:
@@ -77,7 +77,7 @@ function getAppName(channel) {
|
||||
return channel === 'stable'
|
||||
? 'Atom'
|
||||
: `Atom ${process.env.ATOM_CHANNEL_DISPLAY_NAME ||
|
||||
channel.charAt(0).toUpperCase() + channel.slice(1)}`;
|
||||
channel.charAt(0).toUpperCase() + channel.slice(1)}`;
|
||||
}
|
||||
|
||||
function getExecutableName(channel, appName) {
|
||||
@@ -113,8 +113,6 @@ function getApmBinPath() {
|
||||
}
|
||||
|
||||
function getNpmBinPath(external = false) {
|
||||
if (process.env.NPM_BIN_PATH) return process.env.NPM_BIN_PATH;
|
||||
|
||||
const npmBinName = process.platform === 'win32' ? 'npm.cmd' : 'npm';
|
||||
const localNpmBinPath = path.resolve(
|
||||
repositoryRootPath,
|
||||
@@ -123,7 +121,5 @@ function getNpmBinPath(external = false) {
|
||||
'.bin',
|
||||
npmBinName
|
||||
);
|
||||
return !external && fs.existsSync(localNpmBinPath)
|
||||
? localNpmBinPath
|
||||
: npmBinName;
|
||||
return localNpmBinPath;
|
||||
}
|
||||
|
||||
@@ -10,7 +10,7 @@ process.env.ELECTRON_CUSTOM_VERSION = CONFIG.appMetadata.electronVersion;
|
||||
module.exports = function(ci) {
|
||||
console.log('Installing script dependencies');
|
||||
childProcess.execFileSync(
|
||||
CONFIG.getNpmBinPath(ci),
|
||||
'npm',
|
||||
['--loglevel=error', ci ? 'ci' : 'install'],
|
||||
{ env: process.env, cwd: CONFIG.scriptRootPath }
|
||||
);
|
||||
|
||||
@@ -7,7 +7,7 @@ const CONFIG = require('../config');
|
||||
|
||||
module.exports = function(ci) {
|
||||
verifyNode();
|
||||
verifyNpm(ci);
|
||||
// verifyNpm(ci);
|
||||
verifyPython();
|
||||
};
|
||||
|
||||
|
||||
Reference in New Issue
Block a user