summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCory <coryaccounts@outlook.com>2018-09-29 19:55:20 -0500
committerCory <coryaccounts@outlook.com>2018-09-29 19:55:20 -0500
commitfe316b4dcf776891e3e02c4a460b73ff1e5cd0da (patch)
tree813fb5c419b10637b9b54385296a370f3ac99daa
parente696e456fb89b9de53e2dc5e7e1feb6091fa1f3b (diff)
package icon.png in app.asar
-rw-r--r--electron_js/main.js2
-rw-r--r--package.json7
2 files changed, 5 insertions, 4 deletions
diff --git a/electron_js/main.js b/electron_js/main.js
index 910d5cc6..ecd5151a 100644
--- a/electron_js/main.js
+++ b/electron_js/main.js
@@ -109,7 +109,7 @@ const mx = globalShortcut.register('CommandOrControl+Alt+F', () => {
icon: path.join(__dirname, '/../resources/icon.png'),
webPreferences:{nodeIntegration:false}});
//
- console.log (__dirname+'/../icon.png');
+ console.log (path.join(__dirname, '/../resources/icon.png'));
diff --git a/package.json b/package.json
index ecf8fb61..5b2ad9a4 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
{
"name": "zmninjapro",
"description": "Home security mobile app for ZoneMinder",
- "version": "1.3.022",
+ "version":"1.3.025",
"displayName": "zmNinja",
"author": "Pliable Pixels",
"license": "custom see LICENSE.md",
@@ -131,7 +131,8 @@
"files": [
"electron_js/main.js",
"www/**/*",
- "!node_modules/**/*"
+ "!node_modules/**/*",
+ "resources/icon.png"
],
"extraResources": [
"node_modules/electron-window-state/**/*",
@@ -174,4 +175,4 @@
]
}
}
-} \ No newline at end of file
+}