diff --git a/ui/desktop/electron-app/config/cli.js b/ui/desktop/electron-app/config/cli.js index 3072f9e74..b85b7e59b 100644 --- a/ui/desktop/electron-app/config/cli.js +++ b/ui/desktop/electron-app/config/cli.js @@ -11,12 +11,12 @@ const artifactDestination = path.resolve(__dirname, '..', 'cli'); const downloadArtifact = (version) => { const archivePlatform = {}; // TODO: Support all available build machines - if (isMac) { + if (isMac()) { archivePlatform.name = 'darwin'; archivePlatform.arch = 'amd64'; } - if (isWindows) { + if (isWindows()) { archivePlatform.name = 'windows'; archivePlatform.arch = 'amd64'; } diff --git a/ui/desktop/electron-app/config/forge.js b/ui/desktop/electron-app/config/forge.js index 71dc5205e..848a587c8 100644 --- a/ui/desktop/electron-app/config/forge.js +++ b/ui/desktop/electron-app/config/forge.js @@ -32,8 +32,7 @@ const createConfig = () => { // Version if (config.RELEASE_VERSION) config.packagerConfig.version = config.RELEASE_VERSION; - - if (isMac) { + if (isMac()) { config.packagerConfig.icon = './config/macos/icon.icns'; config.packagerConfig.osxSign = { 'hardened-runtime': true, @@ -64,7 +63,9 @@ const createConfig = () => { }); } - if (isWindows) { + if (isWindows()) { + config.packagerConfig.icon = './config/windows/icon.ico'; + // Generate EXE file config.makers.push({ name: '@electron-forge/maker-squirrel', diff --git a/ui/desktop/electron-app/config/windows/icon.ico b/ui/desktop/electron-app/config/windows/icon.ico new file mode 100644 index 000000000..7ca39ac08 Binary files /dev/null and b/ui/desktop/electron-app/config/windows/icon.ico differ diff --git a/ui/desktop/electron-app/src/helpers/platform.js b/ui/desktop/electron-app/src/helpers/platform.js index 72180d0a6..2565c4f7c 100644 --- a/ui/desktop/electron-app/src/helpers/platform.js +++ b/ui/desktop/electron-app/src/helpers/platform.js @@ -1,6 +1,6 @@ const os = require('os'); module.exports = { - isMac: () => Boolean(os.type().match(/darwin/i)), + isMac: () => Boolean(os.type().match(/(darwin)/i)), isWindows: () => Boolean(os.type().match(/(windows)/i)), };