github/atom
1
1
Fork 0
mirror of https://github.com/atom/atom.git synced 2026-01-25 06:48:28 -05:00
Code Issues Packages Projects Releases Wiki Activity

resourcesPath -> shellCommandsPath

Browse Source
This commit is contained in:
Antonio Scandurra
2016-07-28 18:54:50 +02:00
parent 82bbf0cd3c
commit 0775062e9e
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
build/config.js
View File

@@ -10,13 +10,13 @@ const appMetadata = require('../package.json')
const repositoryRootPath = path.resolve(__dirname, '..')
const buildOutputPath = path.join(repositoryRootPath, 'out')
const intermediateAppPath = path.join(buildOutputPath, 'app')
const intermediateResourcesPath = path.join(buildOutputPath, 'resources')
const intermediateShellCommandsPath = path.join(buildOutputPath, 'shell')
const cachePath = path.join(repositoryRootPath, 'cache')
const channel = getChannel()
module.exports = {
appMetadata, channel,
repositoryRootPath, buildOutputPath, intermediateAppPath, intermediateResourcesPath,
repositoryRootPath, buildOutputPath, intermediateAppPath, intermediateShellCommandsPath,
cachePath
}

6
build/lib/copy-assets.js
View File

@@ -28,14 +28,14 @@ module.exports = function () {
fs.copySync(srcPath, computeDestinationPath(srcPath), {filter: skipIgnoredPaths})
}
console.log(`Copying resources to ${CONFIG.intermediateResourcesPath}...`);
console.log(`Copying shell commands to ${CONFIG.intermediateShellCommandsPath}...`);
fs.copySync(
path.join(CONFIG.repositoryRootPath, 'apm', 'node_modules', 'atom-package-manager'),
path.join(CONFIG.intermediateResourcesPath, 'apm'),
path.join(CONFIG.intermediateShellCommandsPath, 'apm'),
{filter: skipIgnoredPaths}
)
if (process.platform !== 'windows') {
fs.copySync(path.join(CONFIG.repositoryRootPath, 'atom.sh'), path.join(CONFIG.intermediateResourcesPath, 'atom.sh'))
fs.copySync(path.join(CONFIG.repositoryRootPath, 'atom.sh'), path.join(CONFIG.intermediateShellCommandsPath, 'atom.sh'))
}
}

2
build/lib/package-application.js
View File

@@ -36,7 +36,7 @@ module.exports = function () {
if (process.platform === 'darwin') {
const bundleResourcesPath = path.join(appPaths[0], 'Atom.app', 'Contents', 'Resources')
fs.copySync(CONFIG.intermediateResourcesPath, path.join(bundleResourcesPath, 'app'))
fs.copySync(CONFIG.intermediateShellCommandsPath, path.join(bundleResourcesPath, 'app'))
} else {
throw new Error('TODO: handle this case!')
}