From 14cc927aa95867cc5b1d9816f1c1d65cd86ef4c0 Mon Sep 17 00:00:00 2001
From: Samuel Attard <sattard@atlassian.com>
Date: Sat, 20 May 2017 15:44:14 +1000
Subject: [PATCH] fix(maker): fix renaming of DMG output when a custom name is
 provided

---
 src/makers/darwin/dmg.js | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/makers/darwin/dmg.js b/src/makers/darwin/dmg.js
index 5d72c8c147..a1e03c0c58 100644
--- a/src/makers/darwin/dmg.js
+++ b/src/makers/darwin/dmg.js
@@ -12,17 +12,21 @@ export const isSupportedOnCurrentPlatform = async () => process.platform === 'da
 export default async ({ dir, appName, targetArch, forgeConfig, packageJSON }) => {
   const electronDMG = require('electron-installer-dmg');
 
-  const outPath = path.resolve(dir, '../make', `${appName}.dmg`);
+  const userConfig = configFn(forgeConfig.electronInstallerDMG, targetArch);
+
+  const outPath = path.resolve(dir, '../make', `${userConfig.name || appName}.dmg`);
   const wantedOutPath = path.resolve(dir, '../make', `${appName}-${packageJSON.version}.dmg`);
   await ensureFile(outPath);
   const dmgConfig = Object.assign({
     overwrite: true,
     name: appName,
-  }, configFn(forgeConfig.electronInstallerDMG, targetArch), {
+  }, userConfig, {
     appPath: path.resolve(dir, `${appName}.app`),
     out: path.dirname(outPath),
   });
   await pify(electronDMG)(dmgConfig);
-  await fs.rename(outPath, wantedOutPath);
+  if (!userConfig.name) {
+    await fs.rename(outPath, wantedOutPath);
+  }
   return [wantedOutPath];
 };