github/atom
1
1
Fork 0
mirror of https://github.com/atom/atom.git synced 2026-01-23 13:58:08 -05:00
Code Issues Packages Projects Releases Wiki Activity

🐛 Fix invalid shellAppDir on OS X

Browse Source 
This resolves the "perfect storm" scenario that resulted when #8829
got merged with `master`. The merge resulted in an invalid shellAppDir
being used, which in turn propagated all the way into script/set-version
and thus the plist update commands failed since it was pointed at a path
which did not exist.

TL;DR: the .app suffix was missing from shellAppDir due to code reordering.

/cc @maxbrunsfeld
This commit is contained in:
Thomas Johansen
2015-09-26 13:12:08 +02:00
parent 4bca7ff07c
commit 82805d204e
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build/Gruntfile.coffee
View File

@@ -52,6 +52,7 @@ module.exports = (grunt) ->
appFileName += '-beta'
apmFileName += '-beta'
appName += '.app' if process.platform is 'darwin'
shellAppDir = path.join(buildDir, appName)
symbolsDir = path.join(buildDir, 'Atom.breakpad.syms')
@@ -63,7 +64,6 @@ module.exports = (grunt) ->
killCommand = 'taskkill /F /IM atom.exe'
else if process.platform is 'darwin'
homeDir = process.env.HOME
appName += '.app'
contentsDir = path.join(shellAppDir, 'Contents')
appDir = path.join(contentsDir, 'Resources', 'app')
installDir ?= path.join('/Applications', appName)