This commit is contained in:
crusader 2018-10-02 20:33:17 +09:00
parent 3adf87dd3a
commit e12cf15dda
4 changed files with 39 additions and 17 deletions

View File

@ -8,7 +8,7 @@
"npmSkipBuildFromSource": false, "npmSkipBuildFromSource": false,
"artifactName": "${name}-${version}-${os}-${arch}.${ext}", "artifactName": "${name}-${version}-${os}-${arch}.${ext}",
"directories": { "directories": {
"buildResources": "./config/build/${os}/icon", "buildResources": "./config/build/",
"output": "./build/package" "output": "./build/package"
}, },
"files": [ "files": [
@ -28,6 +28,13 @@
{ {
"from": "config/_database.sqlite", "from": "config/_database.sqlite",
"to": "./bin/database.sqlite" "to": "./bin/database.sqlite"
},
{
"filter": [
"**/*"
],
"from": "config/build/${os}/icon/",
"to": "./icon/"
} }
], ],
"linux": { "linux": {
@ -41,7 +48,7 @@
} }
], ],
"executableName": "overFlow-NetworkScanner", "executableName": "overFlow-NetworkScanner",
"icon": "config/build/linux/icon/overflow_512.png", "icon": "config/build/linux/icon/",
"synopsis": "overFlow Network Scanner", "synopsis": "overFlow Network Scanner",
"category": "Utility", "category": "Utility",
"extraFiles": [ "extraFiles": [

View File

@ -59,7 +59,7 @@
"@ngrx/store": "^6.1.0", "@ngrx/store": "^6.1.0",
"@ngrx/store-devtools": "^6.1.0", "@ngrx/store-devtools": "^6.1.0",
"@overflow/core-js": "0.0.11", "@overflow/core-js": "0.0.11",
"@overflow/rpc-js": "0.0.9", "@overflow/rpc-js": "0.0.10",
"@types/d3": "^5.0.0", "@types/d3": "^5.0.0",
"@types/fs-extra": "^5.0.4", "@types/fs-extra": "^5.0.4",
"@types/jasmine": "~2.8.6", "@types/jasmine": "~2.8.6",

View File

@ -66,7 +66,8 @@ export class AppWindow {
} else if (__WIN32__) { } else if (__WIN32__) {
// windowOptions.frame = false; // windowOptions.frame = false;
} else if (__LINUX__) { } else if (__LINUX__) {
windowOptions.icon = path.join( windowOptions.icon = __DEV__
? path.join(
__dirname, __dirname,
'..', '..',
'..', '..',
@ -74,8 +75,16 @@ export class AppWindow {
'build', 'build',
'linux', 'linux',
'icon', 'icon',
'overflow_512_outline2.png' '512x512.png'
); )
: path.join(
__dirname,
'..',
'..',
'icon',
'512x512.png'
)
;
} }
this.window = new BrowserWindow(windowOptions); this.window = new BrowserWindow(windowOptions);

View File

@ -349,12 +349,13 @@
dependencies: dependencies:
reflect-metadata "^0.1.12" reflect-metadata "^0.1.12"
"@overflow/rpc-js@0.0.9": "@overflow/rpc-js@0.0.10":
version "0.0.9" version "0.0.10"
resolved "https://nexus.loafle.net/repository/npm-all/@overflow/rpc-js/-/rpc-js-0.0.9.tgz#8823fba8aaed6197b38499231119e66c6ff556f1" resolved "https://nexus.loafle.net/repository/npm-all/@overflow/rpc-js/-/rpc-js-0.0.10.tgz#547afb7abbb2393cab06c87097e37162f38d51e8"
integrity sha512-hUjU3M25akFN4aQUo8DY61hbL6zkW037G3v3r2inER5S9wDY7BwTVn+bSBo+Rr7mIlMstWGBNhf+ZwXQfcVi1g== integrity sha512-wdgVyY9wXTR1be/0Xema8pY6zetOpgBXApzhHGln8sXNfNA6Qkh1iV2x0eqecAaCjna5jWtMsa4a7Gooyk9Oog==
dependencies: dependencies:
"@overflow/core-js" "^0.0.11" "@overflow/core-js" "^0.0.11"
url-join "^4.0.0"
"@schematics/angular@0.7.5": "@schematics/angular@0.7.5":
version "0.7.5" version "0.7.5"
@ -8863,6 +8864,11 @@ urix@^0.1.0:
resolved "https://nexus.loafle.net/repository/npm-all/urix/-/urix-0.1.0.tgz#da937f7a62e21fec1fd18d49b35c2935067a6c72" resolved "https://nexus.loafle.net/repository/npm-all/urix/-/urix-0.1.0.tgz#da937f7a62e21fec1fd18d49b35c2935067a6c72"
integrity sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI= integrity sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=
url-join@^4.0.0:
version "4.0.0"
resolved "https://nexus.loafle.net/repository/npm-all/url-join/-/url-join-4.0.0.tgz#4d3340e807d3773bda9991f8305acdcc2a665d2a"
integrity sha1-TTNA6AfTdzvamZH4MFrNzCpmXSo=
url-loader@^1.0.1: url-loader@^1.0.1:
version "1.1.1" version "1.1.1"
resolved "https://nexus.loafle.net/repository/npm-all/url-loader/-/url-loader-1.1.1.tgz#4d1f3b4f90dde89f02c008e662d604d7511167c1" resolved "https://nexus.loafle.net/repository/npm-all/url-loader/-/url-loader-1.1.1.tgz#4d1f3b4f90dde89f02c008e662d604d7511167c1"