Rename packaged application on OS X and Linux

- On OS X, eliminate wrapper directory because app bundle is already a directory. - On Linux, rename wrapper directory to include channel, version, and architecture. Signed-off-by: Antonio Scandurra <as-cii@github.com>
PGP-or-D1E · Aug 3, 2016 · 210c583 · 210c583
1 parent f102fcb
commit 210c583
Showing 2 changed files with 30 additions and 3 deletions.
diff --git a/circle.yml b/circle.yml
@@ -32,8 +32,10 @@ dependencies:
     - script/build --code-sign
 
   post:
-    - cd out/Atom-darwin-x64 && zip -r ../atom-mac.zip ./Atom.app && cd -
-    - cd out && zip -r ./atom-mac-symbols.zip ./symbols && cd -
+    - cd out
+    - zip -r ./atom-mac.zip ./Atom.app
+    - zip -r ./atom-mac-symbols.zip ./symbols
+    - cd -
 
   cache_directories:
     - cache

diff --git a/script/lib/package-application.js b/script/lib/package-application.js
@@ -132,8 +132,33 @@ function runPackager (options) {
         throw new Error(err)
       } else {
         assert(packageOutputDirPaths.length === 1, 'Generated more than one electron application!')
-        resolve(packageOutputDirPaths[0])
+        const packagedAppPath = renamePackagedAppDir(packageOutputDirPaths[0])
+        resolve(packagedAppPath)
       }
     })
   })
 }
+
+function renamePackagedAppDir (packageOutputDirPath) {
+  let packagedAppPath
+  if (process.platform === 'darwin') {
+    const appBundleName = getAppName() + '.app'
+    packagedAppPath = path.join(CONFIG.buildOutputPath, appBundleName)
+    fs.renameSync(path.join(packageOutputDirPath, appBundleName), packagedAppPath)
+  } else if (process.platform === 'linux') {
+    const appName = CONFIG.channel === 'beta' ? 'atom-beta' : 'atom'
+    let architecture
+    if (process.arch === 'ia32') {
+      architecture = 'i386'
+    } else if (process.arch === 'x64') {
+      architecture = 'amd64'
+    } else {
+      architecture = process.arch
+    }
+    packagedAppPath = path.join(CONFIG.buildOutputPath, `${appName}-${CONFIG.appMetadata.version}-${architecture}`)
+    fs.renameSync(packageOutputDirPath, packagedAppPath)
+  } else {
+    throw new Error('Implement this!')
+  }
+  return packagedAppPath
+}