From 82805d204e60a8e2ac4e463a885c181dead20925 Mon Sep 17 00:00:00 2001 From: Thomas Johansen Date: Sat, 26 Sep 2015 13:12:08 +0200 Subject: [PATCH] :bug: Fix invalid shellAppDir on OS X 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 --- build/Gruntfile.coffee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/Gruntfile.coffee b/build/Gruntfile.coffee index 4bc276a39..351db9d31 100644 --- a/build/Gruntfile.coffee +++ b/build/Gruntfile.coffee @@ -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)