This commit is contained in:
crusader 2018-10-03 00:17:11 +09:00
parent 389729aa02
commit 989236fe1a
4 changed files with 18 additions and 4 deletions

View File

@ -59,6 +59,9 @@
] ]
}, },
"deb": { "deb": {
"depends": [
"libpcap0.8"
],
"afterInstall": "config/build/linux/after-install.tpl" "afterInstall": "config/build/linux/after-install.tpl"
}, },
"mac": { "mac": {

View File

@ -65,6 +65,7 @@
"@types/jasmine": "~2.8.6", "@types/jasmine": "~2.8.6",
"@types/jasminewd2": "~2.0.3", "@types/jasminewd2": "~2.0.3",
"@types/node": "^8.10.4", "@types/node": "^8.10.4",
"@types/ps-tree": "^1.1.0",
"@types/source-map-support": "^0.4.1", "@types/source-map-support": "^0.4.1",
"@types/sqlite3": "^3.1.3", "@types/sqlite3": "^3.1.3",
"awesome-typescript-loader": "^5.2.0", "awesome-typescript-loader": "^5.2.0",
@ -98,6 +99,7 @@
"primeng": "^6.1.3", "primeng": "^6.1.3",
"primer-support": "^4.0.0", "primer-support": "^4.0.0",
"protractor": "~5.3.0", "protractor": "~5.3.0",
"ps-tree": "^1.1.0",
"source-map-support": "^0.5.8", "source-map-support": "^0.5.8",
"ts-node": "~5.0.1", "ts-node": "~5.0.1",
"tslint": "~5.9.1", "tslint": "~5.9.1",

View File

@ -201,7 +201,7 @@ app.on('ready', () => {
if (!__DEV__) { if (!__DEV__) {
const probePath = path.join(__dirname, '..', '..', 'bin', 'probe'); const probePath = path.join(__dirname, '..', '..', 'bin', 'probe');
probeProcess = ChildProcess.spawn(probePath); probeProcess = ChildProcess.spawn(probePath, [], { stdio: ['ignore', 'ignore', 'ignore'], detached: true });
} }
readyTime = now() - launchTime; readyTime = now() - launchTime;
@ -410,17 +410,20 @@ app.on('web-contents-created', (event, contents) => {
app.on('before-quit', function (event) { app.on('before-quit', function (event) {
console.log(`before-quit`); console.log(`before-quit`);
event.preventDefault();
if (null !== db) { if (null !== db) {
db.close(); db.close();
} }
if (null !== probeProcess && !probeProcess.killed) { if (null !== probeProcess && !probeProcess.killed) {
probeProcess.kill(); console.log(`probeProcess.kill`);
probeProcess.kill('SIGKILL');
} }
}); });
app.on('window-all-closed', function (event) {
app.quit();
});
// app.on( // app.on(
// 'certificate-error', // 'certificate-error',
// (event, webContents, url, error, certificate, callback) => { // (event, webContents, url, error, certificate, callback) => {
@ -461,6 +464,7 @@ function createWindow() {
mainWindow = null; mainWindow = null;
if (!__DARWIN__ && !preventQuit) { if (!__DARWIN__ && !preventQuit) {
console.log(`app.quit`);
app.quit(); app.quit();
} }
}); });

View File

@ -643,6 +643,11 @@
resolved "https://nexus.loafle.net/repository/npm-all/@types/node/-/node-8.10.31.tgz#1d9033eebdbc4dc139ff7af36e003a56dbf4ed79" resolved "https://nexus.loafle.net/repository/npm-all/@types/node/-/node-8.10.31.tgz#1d9033eebdbc4dc139ff7af36e003a56dbf4ed79"
integrity sha512-61Hi0+sBaxkJhcBuUaoDh91K8gJ3BjPHMorb8UdHmeluxUc9ZBGlYPd6ZxITuJhyv9D8JE32LthfWxyBITdUXQ== integrity sha512-61Hi0+sBaxkJhcBuUaoDh91K8gJ3BjPHMorb8UdHmeluxUc9ZBGlYPd6ZxITuJhyv9D8JE32LthfWxyBITdUXQ==
"@types/ps-tree@^1.1.0":
version "1.1.0"
resolved "https://nexus.loafle.net/repository/npm-all/@types/ps-tree/-/ps-tree-1.1.0.tgz#7e2034e8ccdc16f6b0ced7a88529ebcb3b1dc424"
integrity sha512-rm5GU5sefQpg2d/DQ+fMDZnl9aPiJjJ9FYA12isIocNTZqu9VDZRgCRBx3oYFEdmDpmPmY4hxxmY/+1a84Rtzg==
"@types/q@^0.0.32": "@types/q@^0.0.32":
version "0.0.32" version "0.0.32"
resolved "https://nexus.loafle.net/repository/npm-all/@types/q/-/q-0.0.32.tgz#bd284e57c84f1325da702babfc82a5328190c0c5" resolved "https://nexus.loafle.net/repository/npm-all/@types/q/-/q-0.0.32.tgz#bd284e57c84f1325da702babfc82a5328190c0c5"