diff --git a/src/api/make.js b/src/api/make.js index 80f4971944..ac6539dbfd 100644 --- a/src/api/make.js +++ b/src/api/make.js @@ -1,9 +1,9 @@ import 'colors'; import fs from 'fs-extra'; import path from 'path'; +import { hostArch } from 'electron-packager/targets'; import asyncOra from '../util/ora-handler'; -import electronHostArch from '../util/electron-host-arch'; import getForgeConfig from '../util/forge-config'; import runHook from '../util/hook'; import { info, warn } from '../util/messages'; @@ -45,7 +45,7 @@ export default async (providedOptions = {}) => { dir: process.cwd(), interactive: false, skipPackage: false, - arch: electronHostArch(), + arch: hostArch(), platform: process.platform, }, providedOptions); diff --git a/src/api/package.js b/src/api/package.js index 58f89d35b6..53791394da 100644 --- a/src/api/package.js +++ b/src/api/package.js @@ -5,8 +5,8 @@ import glob from 'glob'; import path from 'path'; import pify from 'pify'; import packager from 'electron-packager'; +import { hostArch } from 'electron-packager/targets'; -import electronHostArch from '../util/electron-host-arch'; import getForgeConfig from '../util/forge-config'; import runHook from '../util/hook'; import realOra, { fakeOra } from '../util/ora'; @@ -38,7 +38,7 @@ export default async (providedOptions = {}) => { let { dir, interactive, arch, platform } = Object.assign({ dir: process.cwd(), interactive: false, - arch: electronHostArch(), + arch: hostArch(), platform: process.platform, }, providedOptions); diff --git a/src/util/electron-host-arch.js b/src/util/electron-host-arch.js deleted file mode 100644 index 1ed8652f27..0000000000 --- a/src/util/electron-host-arch.js +++ /dev/null @@ -1,7 +0,0 @@ -export default () => { - if (process.arch === 'arm' && process.config.variables.arm_version === '7') { - return 'armv7l'; - } - - return process.arch; -}; diff --git a/test/fast/electron-host-arch_spec.js b/test/fast/electron-host-arch_spec.js deleted file mode 100644 index faeb9eea61..0000000000 --- a/test/fast/electron-host-arch_spec.js +++ /dev/null @@ -1,13 +0,0 @@ -import { expect } from 'chai'; - -import electronHostArch from '../../src/util/electron-host-arch'; - -describe('electron-host-arch', () => { - if (process.arch !== 'arm') { - describe('on non-arm systems', () => { - it('should return the current arch', () => { - expect(electronHostArch()).to.equal(process.arch); - }); - }); - } -});