diff --git a/config/build/windows/bin/WinPcap_4_1_3.exe b/config/build/win/bin/WinPcap_4_1_3.exe similarity index 100% rename from config/build/windows/bin/WinPcap_4_1_3.exe rename to config/build/win/bin/WinPcap_4_1_3.exe diff --git a/config/build/windows/bin/npcap-0.99-r7.exe b/config/build/win/bin/npcap-0.99-r7.exe similarity index 100% rename from config/build/windows/bin/npcap-0.99-r7.exe rename to config/build/win/bin/npcap-0.99-r7.exe diff --git a/config/build/windows/bin/probe-windows-amd64.exe b/config/build/win/bin/probe-win-x64.exe similarity index 72% rename from config/build/windows/bin/probe-windows-amd64.exe rename to config/build/win/bin/probe-win-x64.exe index feb2639..b5981a3 100644 Binary files a/config/build/windows/bin/probe-windows-amd64.exe and b/config/build/win/bin/probe-win-x64.exe differ diff --git a/config/build/windows/icon/overflow_256.ico b/config/build/win/icon/overflow_256.ico similarity index 100% rename from config/build/windows/icon/overflow_256.ico rename to config/build/win/icon/overflow_256.ico diff --git a/config/build/windows/nsis/installer.nsh b/config/build/win/nsis/installer.nsh similarity index 100% rename from config/build/windows/nsis/installer.nsh rename to config/build/win/nsis/installer.nsh diff --git a/electron-builder.json b/electron-builder.json index 371b4d3..13f1b1a 100644 --- a/electron-builder.json +++ b/electron-builder.json @@ -105,7 +105,7 @@ ], "legalTrademarks": "overFlow", "publisherName": "LOAFLE", - "icon": "config/build/windows/icon/overflow_256.ico", + "icon": "config/build/win/icon/overflow_256.ico", "extraResources": [ { "from": "config/build/${os}/bin/probe-${os}-${arch}.exe", @@ -117,9 +117,8 @@ "oneClick": false, "perMachine": true, "allowToChangeInstallationDirectory": false, - "installerIcon": "windows/icon/overflow_256.ico", - "uninstallerIcon": "windows/icon/overflow_256.ico", - "include": "config/build/windows/nsis/installer.nsh", + "installerIcon": "win/icon/overflow_256.ico", + "uninstallerIcon": "win/icon/overflow_256.ico", "menuCategory": "overFlow" } } \ No newline at end of file diff --git a/src/electron/main.ts b/src/electron/main.ts index 3da8699..c9d7e94 100644 --- a/src/electron/main.ts +++ b/src/electron/main.ts @@ -200,7 +200,9 @@ app.on('ready', () => { }); if (!__DEV__) { - const probePath = path.join(__dirname, '..', 'bin', 'probe'); + const probePath = __WIN32__ + ? path.join(__dirname, '..', 'bin', 'probe.exe') + : path.join(__dirname, '..', 'bin', 'probe'); probeProcess = ChildProcess.spawn(probePath, [], { stdio: ['ignore', 'ignore', 'ignore'], detached: true }); }