From e12cf15dda60a4bd55c7c30139abf8d4adc64a9c Mon Sep 17 00:00:00 2001
From: crusader <crusader@atgame.net>
Date: Tue, 2 Oct 2018 20:33:17 +0900
Subject: [PATCH] ing

---
 electron-builder.json      | 11 +++++++++--
 package.json               |  2 +-
 src/electron/app-window.ts | 29 +++++++++++++++++++----------
 yarn.lock                  | 14 ++++++++++----
 4 files changed, 39 insertions(+), 17 deletions(-)

diff --git a/electron-builder.json b/electron-builder.json
index 8c7f4e7..6066439 100644
--- a/electron-builder.json
+++ b/electron-builder.json
@@ -8,7 +8,7 @@
   "npmSkipBuildFromSource": false,
   "artifactName": "${name}-${version}-${os}-${arch}.${ext}",
   "directories": {
-    "buildResources": "./config/build/${os}/icon",
+    "buildResources": "./config/build/",
     "output": "./build/package"
   },
   "files": [
@@ -28,6 +28,13 @@
     {
       "from": "config/_database.sqlite",
       "to": "./bin/database.sqlite"
+    },
+    {
+      "filter": [
+        "**/*"
+      ],
+      "from": "config/build/${os}/icon/",
+      "to": "./icon/"
     }
   ],
   "linux": {
@@ -41,7 +48,7 @@
       }
     ],
     "executableName": "overFlow-NetworkScanner",
-    "icon": "config/build/linux/icon/overflow_512.png",
+    "icon": "config/build/linux/icon/",
     "synopsis": "overFlow Network Scanner",
     "category": "Utility",
     "extraFiles": [
diff --git a/package.json b/package.json
index 1af54d3..b9e6279 100644
--- a/package.json
+++ b/package.json
@@ -59,7 +59,7 @@
     "@ngrx/store": "^6.1.0",
     "@ngrx/store-devtools": "^6.1.0",
     "@overflow/core-js": "0.0.11",
-    "@overflow/rpc-js": "0.0.9",
+    "@overflow/rpc-js": "0.0.10",
     "@types/d3": "^5.0.0",
     "@types/fs-extra": "^5.0.4",
     "@types/jasmine": "~2.8.6",
diff --git a/src/electron/app-window.ts b/src/electron/app-window.ts
index 9af08b1..84d40c4 100644
--- a/src/electron/app-window.ts
+++ b/src/electron/app-window.ts
@@ -66,16 +66,25 @@ export class AppWindow {
     } else if (__WIN32__) {
       // windowOptions.frame = false;
     } else if (__LINUX__) {
-      windowOptions.icon = path.join(
-        __dirname,
-        '..',
-        '..',
-        'config',
-        'build',
-        'linux',
-        'icon',
-        'overflow_512_outline2.png'
-      );
+      windowOptions.icon = __DEV__
+        ? path.join(
+          __dirname,
+          '..',
+          '..',
+          'config',
+          'build',
+          'linux',
+          'icon',
+          '512x512.png'
+        )
+        : path.join(
+          __dirname,
+          '..',
+          '..',
+          'icon',
+          '512x512.png'
+        )
+        ;
     }
 
     this.window = new BrowserWindow(windowOptions);
diff --git a/yarn.lock b/yarn.lock
index ffc8a1c..77fd604 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -349,12 +349,13 @@
   dependencies:
     reflect-metadata "^0.1.12"
 
-"@overflow/rpc-js@0.0.9":
-  version "0.0.9"
-  resolved "https://nexus.loafle.net/repository/npm-all/@overflow/rpc-js/-/rpc-js-0.0.9.tgz#8823fba8aaed6197b38499231119e66c6ff556f1"
-  integrity sha512-hUjU3M25akFN4aQUo8DY61hbL6zkW037G3v3r2inER5S9wDY7BwTVn+bSBo+Rr7mIlMstWGBNhf+ZwXQfcVi1g==
+"@overflow/rpc-js@0.0.10":
+  version "0.0.10"
+  resolved "https://nexus.loafle.net/repository/npm-all/@overflow/rpc-js/-/rpc-js-0.0.10.tgz#547afb7abbb2393cab06c87097e37162f38d51e8"
+  integrity sha512-wdgVyY9wXTR1be/0Xema8pY6zetOpgBXApzhHGln8sXNfNA6Qkh1iV2x0eqecAaCjna5jWtMsa4a7Gooyk9Oog==
   dependencies:
     "@overflow/core-js" "^0.0.11"
+    url-join "^4.0.0"
 
 "@schematics/angular@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"
   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:
   version "1.1.1"
   resolved "https://nexus.loafle.net/repository/npm-all/url-loader/-/url-loader-1.1.1.tgz#4d1f3b4f90dde89f02c008e662d604d7511167c1"