fix(maker): fix debian and redhat maker path calculation

electron · Jun 16, 2017 · c2dca21 · c2dca21
1 parent 63d0f23
commit c2dca21
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/src/makers/linux/deb.js b/src/makers/linux/deb.js
@@ -22,8 +22,9 @@ export default async ({ dir, targetArch, forgeConfig, packageJSON }) => {
 
  const arch = debianArch(targetArch);
  const userConfig = configFn(forgeConfig.electronInstallerDebian, targetArch);
- const versionedName = `${packageJSON.name}_${packageJSON.version}_${arch}`;
- const outPath = path.resolve(dir, '../make', `${userConfig.name || versionedName}.deb`);
+ userConfig.options = userConfig.options || {};
+ const versionedName = `${userConfig.options.name || packageJSON.name}_${packageJSON.version}_${arch}`;
+ const outPath = path.resolve(dir, '../make', `${versionedName}.deb`);
 
  await ensureFile(outPath);
  const debianDefaults = {

diff --git a/src/makers/linux/rpm.js b/src/makers/linux/rpm.js
@@ -22,8 +22,9 @@ export default async ({ dir, targetArch, forgeConfig, packageJSON }) => {
 
  const arch = rpmArch(targetArch);
  const userConfig = configFn(forgeConfig.electronInstallerRedhat, targetArch);
- const versionedName = `${packageJSON.name}-${packageJSON.version}.${arch}`;
- const outPath = path.resolve(dir, '../make', `${userConfig.name || versionedName}.rpm`);
+ userConfig.options = userConfig.options || {};
+ const versionedName = `${userConfig.options.name || packageJSON.name}-${packageJSON.version}.${arch}`;
+ const outPath = path.resolve(dir, '../make', `${versionedName}.rpm`);
 
  await ensureFile(outPath);
  const rpmDefaults = {