From 1ba181578ee68d21dc5d97f90ed3a9dcdb469225 Mon Sep 17 00:00:00 2001 From: Daniel LaCosse <3759828+daniellacosse@users.noreply.github.com> Date: Thu, 29 Jun 2023 13:21:52 -0400 Subject: [PATCH] try this --- .../electron_app/electron_builder.json | 16 ++++++++++++++ .../scripts/get_electron_build_flags.mjs | 21 ++++--------------- 2 files changed, 20 insertions(+), 17 deletions(-) create mode 100644 src/server_manager/electron_app/electron_builder.json diff --git a/src/server_manager/electron_app/electron_builder.json b/src/server_manager/electron_app/electron_builder.json new file mode 100644 index 00000000..5b85745e --- /dev/null +++ b/src/server_manager/electron_app/electron_builder.json @@ -0,0 +1,16 @@ +{ + "asarUnpack": ["server_manager/web_app/images"], + "artifactName": "Outline-Manager.${ext}", + "linux": { + "icon": "icons/png", + "category": "Network" + }, + "win": { + "icon": "icons/win/icon.ico", + "sign": "src/server_manager/electron_app/windows/electron_builder_signing_plugin.cjs", + "signingHashAlgorithms": ["sha256"] + }, + "mac": { + "icon": "icons/mac/icon.icns" + } +} diff --git a/src/server_manager/scripts/get_electron_build_flags.mjs b/src/server_manager/scripts/get_electron_build_flags.mjs index 0ba6c875..42338781 100644 --- a/src/server_manager/scripts/get_electron_build_flags.mjs +++ b/src/server_manager/scripts/get_electron_build_flags.mjs @@ -17,32 +17,19 @@ import url from 'url'; export async function getElectronBuildFlags(platform, buildMode) { let buildFlags = [ '--projectDir=build/server_manager/electron_app/static', - '--config.asarUnpack=server_manager/web_app/images', + '--config=../../../../src/server_manager/electron_app/electron_builder.json', '--publish=never', - '--config.artifactName=Outline-Manager.${ext}', ]; switch (platform) { case 'linux': - buildFlags = [ - '--linux', - '--config.linux.icon=icons/png', - '--config.linux.category=Network', - ...buildFlags, - ]; + buildFlags = ['--linux', ...buildFlags]; break; case 'windows': - buildFlags = [ - '--win', - '--ia32', - '--config.win.icon=icons/win/icon.ico', - '--config.win.sign=src/server_manager/electron_app/windows/electron_builder_signing_plugin.cjs', - '--config.win.signingHashAlgorithms=["sha256"]', - ...buildFlags, - ]; + buildFlags = ['--win', '--ia32', ...buildFlags]; break; case 'macos': - buildFlags = ['--mac', '--config.mac.icon=icons/mac/icon.icns', ...buildFlags]; + buildFlags = ['--mac', ...buildFlags]; } if (buildMode === 'release') {