This commit is contained in:
crusader 2018-10-04 19:05:28 +09:00
parent dcda3c3cbc
commit b81723c133
3 changed files with 2 additions and 13 deletions

View File

@ -3,6 +3,6 @@
!macroend !macroend
!macro customInstall !macro customInstall
File "${BUILD_RESOURCES_DIR}\bin\npcap-0.99-r7.exe" File "${BUILD_RESOURCES_DIR}\win\bin\npcap-0.99-r7.exe"
ExecWait '"$INSTDIR\npcap-0.99-r7.exe" /npf_startup=yes /loopback_support=yes /admin_only=no /dot11_support=yes /vlan_support=yes /winpcap_mode=yes' ExecWait '"$INSTDIR\npcap-0.99-r7.exe" /npf_startup=yes /loopback_support=yes /admin_only=no /dot11_support=yes /vlan_support=yes /winpcap_mode=yes'
!macroend !macroend

View File

@ -5,7 +5,7 @@
"extraMetadata": { "extraMetadata": {
"name": "overflow-network-scanner" "name": "overflow-network-scanner"
}, },
"asar": false, "asar": true,
"compression": "normal", "compression": "normal",
"npmRebuild": false, "npmRebuild": false,
"npmSkipBuildFromSource": false, "npmSkipBuildFromSource": false,
@ -110,10 +110,6 @@
{ {
"from": "config/build/win/bin/probe-${os}-${arch}.exe", "from": "config/build/win/bin/probe-${os}-${arch}.exe",
"to": "./bin/probe.exe" "to": "./bin/probe.exe"
},
{
"from": "config/build/win/bin/npcap-0.99-r7.exe",
"to": "./bin/npcap-0.99-r7.exe"
} }
] ]
}, },

View File

@ -196,7 +196,6 @@ app.on('ready', () => {
if (err) { if (err) {
console.error(err.message); console.error(err.message);
} }
console.log('Connected to the database.');
}); });
if (!__DEV__) { if (!__DEV__) {
@ -410,14 +409,11 @@ app.on('web-contents-created', (event, contents) => {
}); });
app.on('before-quit', function (event) { app.on('before-quit', function (event) {
console.log(`before-quit`);
if (null !== db) { if (null !== db) {
db.close(); db.close();
} }
if (null !== probeProcess && !probeProcess.killed) { if (null !== probeProcess && !probeProcess.killed) {
console.log(`probeProcess.kill`);
probeProcess.kill('SIGKILL'); probeProcess.kill('SIGKILL');
} }
}); });
@ -462,11 +458,8 @@ function createWindow() {
} }
window.onClose(() => { window.onClose(() => {
console.log(`closed`);
mainWindow = null; mainWindow = null;
if (!__DARWIN__ && !preventQuit) { if (!__DARWIN__ && !preventQuit) {
console.log(`app.quit`);
app.quit(); app.quit();
} }
}); });