github/atom
1
1
Fork 0
mirror of https://github.com/atom/atom.git synced 2026-04-06 03:02:13 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:atom/atom into aw/apm-up

Browse Source
This commit is contained in:
Ash Wilson
2018-07-16 10:12:23 -04:00
parent e3e8bbb7d4 aec38c955b
commit c6a1ffedf0
10 changed files with 19 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
script/config.js
View File

@@ -22,13 +22,13 @@ const appMetadata = require(path.join(repositoryRootPath, 'package.json'))
const apmMetadata = require(path.join(apmRootPath, 'package.json'))
const computedAppVersion = computeAppVersion(process.env.ATOM_RELEASE_VERSION || appMetadata.version)
const channel = getChannel(computedAppVersion)
const channelDisplayName = getChannelDisplayName(channel)
const appName = getAppName(channel)
module.exports = {
appMetadata,
apmMetadata,
channel,
channelDisplayName,
appName,
computedAppVersion,
repositoryRootPath,
apmRootPath,
@@ -56,9 +56,10 @@ function getChannel (version) {
return 'stable'
}
function getChannelDisplayName (channel) {
if (channel === 'stable' || channel === 'dev') return null
return process.env.ATOM_CHANNEL_DISPLAY_NAME || channel.charAt(0).toUpperCase() + channel.slice(1)
function getAppName (channel) {
return channel === 'stable'
? 'Atom'
: `Atom ${process.env.ATOM_CHANNEL_DISPLAY_NAME || channel.charAt(0).toUpperCase() + channel.slice(1)}`
}
function computeAppVersion (version) {

3
script/lib/create-debian-package.js
View File

@@ -12,7 +12,6 @@ module.exports = function (packagedAppPath) {
console.log(`Creating Debian package for "${packagedAppPath}"`)
const atomExecutableName = CONFIG.channel === 'stable' ? 'atom' : `atom-${CONFIG.channel}`
const apmExecutableName = CONFIG.channel === 'stable' ? 'apm' : `apm-${CONFIG.channel}`
const appName = CONFIG.channel === 'stable' ? 'Atom' : `Atom ${CONFIG.channelDisplayName}`
const appDescription = CONFIG.appMetadata.description
const appVersion = CONFIG.appMetadata.version
let arch
@@ -88,7 +87,7 @@ module.exports = function (packagedAppPath) {
console.log(`Writing desktop entry file into "${debianPackageApplicationsDirPath}"`)
const desktopEntryTemplate = fs.readFileSync(path.join(CONFIG.repositoryRootPath, 'resources', 'linux', 'atom.desktop.in'))
const desktopEntryContents = template(desktopEntryTemplate)({
appName: appName,
appName: CONFIG.appName,
appFileName: atomExecutableName,
description: appDescription,
installDir: '/usr',

2
script/lib/create-rpm-package.js
View File

@@ -12,7 +12,7 @@ module.exports = function (packagedAppPath) {
console.log(`Creating rpm package for "${packagedAppPath}"`)
const atomExecutableName = CONFIG.channel === 'stable' ? 'atom' : `atom-${CONFIG.channel}`
const apmExecutableName = CONFIG.channel === 'stable' ? 'apm' : `apm-${CONFIG.channel}`
const appName = CONFIG.channel === 'stable' ? 'Atom' : `Atom ${CONFIG.channelDisplayName}`
const appName = CONFIG.appName
const appDescription = CONFIG.appMetadata.description
// RPM versions can't have dashes or tildes in them.
// (Ref.: https://twiki.cern.ch/twiki/bin/view/Main/RPMAndDebVersioning)

2
script/lib/generate-startup-snapshot.js
View File

@@ -74,7 +74,7 @@ module.exports = function (packagedAppPath) {
const verifySnapshotScriptPath = path.join(CONFIG.repositoryRootPath, 'script', 'verify-snapshot-script')
let nodeBundledInElectronPath
if (process.platform === 'darwin') {
const executableName = CONFIG.channelDisplayName ? `Atom ${CONFIG.channelDisplayName}` : 'Atom'
const executableName = CONFIG.appName
nodeBundledInElectronPath = path.join(packagedAppPath, 'Contents', 'MacOS', executableName)
} else if (process.platform === 'win32') {
nodeBundledInElectronPath = path.join(packagedAppPath, 'atom.exe')

5
script/lib/package-application.js
View File

@@ -114,7 +114,7 @@ function buildAsarUnpackGlobExpression () {
function getAppName () {
if (process.platform === 'darwin') {
return CONFIG.channelDisplayName ? `Atom ${CONFIG.channelDisplayName}` : 'Atom'
return CONFIG.appName
} else {
return 'atom'
}
@@ -169,8 +169,7 @@ function renamePackagedAppDir (packageOutputDirPath) {
if (fs.existsSync(packagedAppPath)) fs.removeSync(packagedAppPath)
fs.renameSync(packageOutputDirPath, packagedAppPath)
} else {
const appName = CONFIG.channel !== 'stable' ? `Atom ${CONFIG.channelDisplayName}` : 'Atom'
packagedAppPath = path.join(CONFIG.buildOutputPath, appName)
packagedAppPath = path.join(CONFIG.buildOutputPath, CONFIG.appName)
if (process.platform === 'win32' && process.arch !== 'ia32') {
packagedAppPath += ` ${process.arch}`
}