diff --git a/build/config.js b/build/config.js index 3b0f302ba..ca996bccc 100644 --- a/build/config.js +++ b/build/config.js @@ -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 } diff --git a/build/lib/copy-assets.js b/build/lib/copy-assets.js index 870aac6ea..684b66fa1 100644 --- a/build/lib/copy-assets.js +++ b/build/lib/copy-assets.js @@ -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')) } } diff --git a/build/lib/package-application.js b/build/lib/package-application.js index d5e2765e2..eefff42dc 100644 --- a/build/lib/package-application.js +++ b/build/lib/package-application.js @@ -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!') }