pulsar-edit/pulsar
1
1
Fork 0
mirror of https://github.com/pulsar-edit/pulsar.git synced 2024-11-10 10:17:11 +03:00
Code Issues Packages Projects Releases Wiki Activity

Ensure script/bootstrap works after cleaning dependencies up

Browse Source
This commit is contained in:
Antonio Scandurra 2016-08-29 13:40:17 +02:00
parent 77cba66c2d
commit 14611926ac
5 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
script/config.js
View File

@ -21,15 +21,12 @@ const appMetadata = require(path.join(repositoryRootPath, 'package.json'))
const apmMetadata = require(path.join(apmRootPath, 'package.json'))
const channel = getChannel()
const apmBinPath = getApmBinPath()
const npmBinPath = getNpmBinPath()
module.exports = {
appMetadata, apmMetadata, channel,
repositoryRootPath, apmRootPath, scriptRootPath,
buildOutputPath, docsOutputPath, intermediateAppPath, symbolsPath,
electronDownloadPath, atomHomeDirPath, homeDirPath,
apmBinPath, npmBinPath
getApmBinPath, getNpmBinPath
}
function getChannel () {

2
script/lib/install-apm.js
View File

@ -8,7 +8,7 @@ const CONFIG = require('../config')
module.exports = function () {
console.log('Installing apm')
childProcess.execFileSync(
CONFIG.npmBinPath,
CONFIG.getNpmBinPath(),
['--global-style', '--loglevel=error', 'install'],
{env: process.env, cwd: CONFIG.apmRootPath}
)

2
script/lib/install-atom-dependencies.js
View File

@ -17,7 +17,7 @@ module.exports = function () {
installEnv.npm_config_target_arch = 'ia32'
}
childProcess.execFileSync(
CONFIG.apmBinPath,
CONFIG.getApmBinPath(),
['--loglevel=error', 'install'],
{env: installEnv, cwd: CONFIG.repositoryRootPath, stdio: 'inherit'}
)

2
script/lib/install-script-dependencies.js
View File

@ -8,7 +8,7 @@ const CONFIG = require('../config')
module.exports = function () {
console.log('Installing script dependencies')
childProcess.execFileSync(
CONFIG.npmBinPath,
CONFIG.getNpmBinPath(),
['--loglevel=error', 'install'],
{env: process.env, cwd: CONFIG.scriptRootPath}
)

2
script/lib/verify-machine-requirements.js
View File

@ -25,7 +25,7 @@ function verifyNode () {
}
function verifyNpm () {
const stdout = childProcess.execFileSync(CONFIG.npmBinPath, ['--version'], {env: process.env})
const stdout = childProcess.execFileSync(CONFIG.getNpmBinPath(), ['--version'], {env: process.env})
const fullVersion = stdout.toString().trim()
const majorVersion = fullVersion.split('.')[0]
if (majorVersion >= 3) {