From d335741a6131260d3b77d1309cb2007024e18104 Mon Sep 17 00:00:00 2001
From: Samuel Attard <samuel.r.attard@gmail.com>
Date: Fri, 2 Jun 2017 14:09:40 +1000
Subject: [PATCH] fix(maker): handle name option for the deb, rpm makers as
 well as dmg

---
 src/makers/linux/deb.js | 6 ++++--
 src/makers/linux/rpm.js | 6 ++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/makers/linux/deb.js b/src/makers/linux/deb.js
index 9bf0e23213..1b4dfaaa98 100644
--- a/src/makers/linux/deb.js
+++ b/src/makers/linux/deb.js
@@ -21,7 +21,9 @@ export default async ({ dir, targetArch, forgeConfig, packageJSON }) => {
   const installer = require('electron-installer-debian');
 
   const arch = debianArch(targetArch);
-  const outPath = path.resolve(dir, '../make', `${packageJSON.name}_${packageJSON.version}_${arch}.deb`);
+  const userConfig = configFn(forgeConfig.electronInstallerDebian, targetArch);
+  const versionedName = `${packageJSON.name}_${packageJSON.version}_${arch}`;
+  const outPath = path.resolve(dir, '../make', `${userConfig.name || versionedName}.deb`);
 
   await ensureFile(outPath);
   const debianDefaults = {
@@ -29,7 +31,7 @@ export default async ({ dir, targetArch, forgeConfig, packageJSON }) => {
     dest: path.dirname(outPath),
     src: dir,
   };
-  const debianConfig = Object.assign({}, configFn(forgeConfig.electronInstallerDebian, targetArch), debianDefaults);
+  const debianConfig = Object.assign({}, userConfig, debianDefaults);
 
   await pify(installer)(debianConfig);
   return [outPath];
diff --git a/src/makers/linux/rpm.js b/src/makers/linux/rpm.js
index 5692986cd1..b38c3bb4f9 100644
--- a/src/makers/linux/rpm.js
+++ b/src/makers/linux/rpm.js
@@ -21,7 +21,9 @@ export default async ({ dir, targetArch, forgeConfig, packageJSON }) => {
   const installer = require('electron-installer-redhat');
 
   const arch = rpmArch(targetArch);
-  const outPath = path.resolve(dir, '../make', `${packageJSON.name}-${packageJSON.version}.${arch}.rpm`);
+  const userConfig = configFn(forgeConfig.electronInstallerRedhat, targetArch);
+  const versionedName = `${packageJSON.name}-${packageJSON.version}.${arch}`;
+  const outPath = path.resolve(dir, '../make', `${userConfig.name || versionedName}.rpm`);
 
   await ensureFile(outPath);
   const rpmDefaults = {
@@ -29,7 +31,7 @@ export default async ({ dir, targetArch, forgeConfig, packageJSON }) => {
     dest: path.dirname(outPath),
     src: dir,
   };
-  const rpmConfig = Object.assign({}, configFn(forgeConfig.electronInstallerRedhat, targetArch), rpmDefaults);
+  const rpmConfig = Object.assign({}, userConfig, rpmDefaults);
 
   await pify(installer)(rpmConfig);
   return [outPath];