cross platform of linux is modified

This commit is contained in:
병준 박 2019-12-23 11:11:03 +09:00
parent b1fb9ba6b8
commit e417c995ef
5 changed files with 40 additions and 42 deletions

View File

@ -34,8 +34,7 @@
}, },
"directories": { "directories": {
"buildResources": "./dist/ucap-webmessenger-electron/resources/installer/", "buildResources": "./dist/ucap-webmessenger-electron/resources/installer/",
"output": "./dist/electron/", "output": "./dist/electron/"
"app": "."
}, },
"files": [ "files": [
"**/*", "**/*",

View File

@ -60,6 +60,7 @@ export class AppWindow {
} else if (__WIN32__) { } else if (__WIN32__) {
windowOptions.frame = false; windowOptions.frame = false;
} else if (__LINUX__) { } else if (__LINUX__) {
windowOptions.frame = false;
} }
this.window = new BrowserWindow(windowOptions); this.window = new BrowserWindow(windowOptions);

View File

@ -39,7 +39,7 @@ import { RendererUpdater } from './lib/renderer-updater';
import { Storage } from './lib/storage'; import { Storage } from './lib/storage';
const appIconPath = __LINUX__ const appIconPath = __LINUX__
? path.join(__dirname, 'static', 'icon-logo.png') ? path.join(__dirname, 'resources/linuxicon', '256x256.png')
: path.join(__dirname, 'resources/image', '64_64.png'); : path.join(__dirname, 'resources/image', '64_64.png');
let appWindow: AppWindow | null = null; let appWindow: AppWindow | null = null;

74
package-lock.json generated
View File

@ -2095,9 +2095,9 @@
} }
}, },
"@electron/get": { "@electron/get": {
"version": "1.7.0", "version": "1.7.2",
"resolved": "https://registry.npmjs.org/@electron/get/-/get-1.7.0.tgz", "resolved": "https://registry.npmjs.org/@electron/get/-/get-1.7.2.tgz",
"integrity": "sha512-Xzo+xLQ+gwmGywFnFuG7HNIALPVJOCkvKagGxSXU1LC3s/j3h2Nku9OdwJ4KDkITeUuXfvAO5KS8rLGcmAunNQ==", "integrity": "sha512-LSE4LZGMjGS9TloDx0yO44D2UTbaeKRk+QjlhWLiQlikV6J4spgDCjb6z4YIcqmPAwNzlNCnWF4dubytwI+ATA==",
"dev": true, "dev": true,
"requires": { "requires": {
"debug": "^4.1.1", "debug": "^4.1.1",
@ -2107,7 +2107,7 @@
"global-tunnel-ng": "^2.7.1", "global-tunnel-ng": "^2.7.1",
"got": "^9.6.0", "got": "^9.6.0",
"sanitize-filename": "^1.6.2", "sanitize-filename": "^1.6.2",
"sumchecker": "^3.0.0" "sumchecker": "^3.0.1"
} }
}, },
"@hapi/address": { "@hapi/address": {
@ -3727,9 +3727,9 @@
} }
}, },
"boolean": { "boolean": {
"version": "2.0.3", "version": "3.0.0",
"resolved": "https://registry.npmjs.org/boolean/-/boolean-2.0.3.tgz", "resolved": "https://registry.npmjs.org/boolean/-/boolean-3.0.0.tgz",
"integrity": "sha512-iHzXeFCXWrpjYE7DToXGCBPGZf0eVISqzL+4sgrOSYEKXnb59WHPFvGTTyCj6zJ/MuuLAxEn8zPkrTHHzlt3IA==", "integrity": "sha512-OElxJ1lUSinuoUnkpOgLmxp0DC4ytEhODEL6QJU0NpxE/mI4rUSh8h1P1Wkvfi3xQEBcxXR2gBIPNYNuaFcAbQ==",
"dev": true, "dev": true,
"optional": true "optional": true
}, },
@ -5647,9 +5647,9 @@
"dev": true "dev": true
}, },
"electron": { "electron": {
"version": "7.1.1", "version": "7.1.7",
"resolved": "https://registry.npmjs.org/electron/-/electron-7.1.1.tgz", "resolved": "https://registry.npmjs.org/electron/-/electron-7.1.7.tgz",
"integrity": "sha512-NJPv4SuMJlRUtXBd/Ey9XKSLOZ4+hxsOrHHPXwrBQNNdeZesoSrTMgPymee/FwMRtrSt0Pz8NccEZUu/pxmbhQ==", "integrity": "sha512-aCLJ4BJwnvOckJgovNul22AYlMFDzm4S4KqKCG2iBlFJyMHBxXAKFKMsgYd40LBZWS3hcY6RHpaYjHSAPLS1pw==",
"dev": true, "dev": true,
"requires": { "requires": {
"@electron/get": "^1.0.1", "@electron/get": "^1.0.1",
@ -5658,9 +5658,9 @@
}, },
"dependencies": { "dependencies": {
"@types/node": { "@types/node": {
"version": "12.12.8", "version": "12.12.21",
"resolved": "https://registry.npmjs.org/@types/node/-/node-12.12.8.tgz", "resolved": "https://registry.npmjs.org/@types/node/-/node-12.12.21.tgz",
"integrity": "sha512-XLla8N+iyfjvsa0KKV+BP/iGSoTmwxsu5Ci5sM33z9TjohF72DEz95iNvD6pPmemvbQgxAv/909G73gUn8QR7w==", "integrity": "sha512-8sRGhbpU+ck1n0PGAUgVrWrWdjSW2aqNeyC15W88GRsMpSwzv6RJGlLhE7s2RhVSOdyDmxbqlWSeThq4/7xqlA==",
"dev": true "dev": true
} }
} }
@ -7105,25 +7105,25 @@
} }
}, },
"global-agent": { "global-agent": {
"version": "2.1.6", "version": "2.1.7",
"resolved": "https://registry.npmjs.org/global-agent/-/global-agent-2.1.6.tgz", "resolved": "https://registry.npmjs.org/global-agent/-/global-agent-2.1.7.tgz",
"integrity": "sha512-fL+xfraAlc1MXU8Gs0DAg/eHH+H1CjxbK+BLU3Qt55dAVMAQ8fH8k/UrLwV4A+Vk/hl/TePWuTxFnqJzCV1/Kw==", "integrity": "sha512-ooK7eqGYZku+LgnbfH/Iv0RJ74XfhrBZDlke1QSzcBt0bw1PmJcnRADPAQuFE+R45pKKDTynAr25SBasY2kvow==",
"dev": true, "dev": true,
"optional": true, "optional": true,
"requires": { "requires": {
"boolean": "^2.0.3", "boolean": "^3.0.0",
"core-js": "^3.4.0", "core-js": "^3.4.1",
"es6-error": "^4.1.1", "es6-error": "^4.1.1",
"matcher": "^2.0.0", "matcher": "^2.0.0",
"roarr": "^2.14.4", "roarr": "^2.14.5",
"semver": "^6.3.0", "semver": "^6.3.0",
"serialize-error": "^5.0.0" "serialize-error": "^5.0.0"
}, },
"dependencies": { "dependencies": {
"core-js": { "core-js": {
"version": "3.4.1", "version": "3.6.0",
"resolved": "https://registry.npmjs.org/core-js/-/core-js-3.4.1.tgz", "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.6.0.tgz",
"integrity": "sha512-KX/dnuY/J8FtEwbnrzmAjUYgLqtk+cxM86hfG60LGiW3MmltIc2yAmDgBgEkfm0blZhUrdr1Zd84J2Y14mLxzg==", "integrity": "sha512-AHPTNKzyB+YwgDWoSOCaid9PUSEF6781vsfiK8qUz62zRR448/XgK2NtCbpiUGizbep8Lrpt0Du19PpGGZvw3Q==",
"dev": true, "dev": true,
"optional": true "optional": true
} }
@ -7193,15 +7193,13 @@
"dev": true "dev": true
}, },
"globalthis": { "globalthis": {
"version": "1.0.0", "version": "1.0.1",
"resolved": "https://registry.npmjs.org/globalthis/-/globalthis-1.0.0.tgz", "resolved": "https://registry.npmjs.org/globalthis/-/globalthis-1.0.1.tgz",
"integrity": "sha512-vcCAZTJ3r5Qcu5l8/2oyVdoFwxKgfYnMTR2vwWeux/NAVZK3PwcMaWkdUIn4GJbmKuRK7xcvDsLuK+CKcXyodg==", "integrity": "sha512-mJPRTc/P39NH/iNG4mXa9aIhNymaQikTrnspeCa2ZuJ+mH2QN/rXwtX3XwKrHqWgUQFbNZKtHM105aHzJalElw==",
"dev": true, "dev": true,
"optional": true, "optional": true,
"requires": { "requires": {
"define-properties": "^1.1.2", "define-properties": "^1.1.3"
"function-bind": "^1.1.1",
"object-keys": "^1.0.12"
} }
}, },
"globby": { "globby": {
@ -9787,9 +9785,9 @@
} }
}, },
"matcher": { "matcher": {
"version": "2.0.0", "version": "2.1.0",
"resolved": "https://registry.npmjs.org/matcher/-/matcher-2.0.0.tgz", "resolved": "https://registry.npmjs.org/matcher/-/matcher-2.1.0.tgz",
"integrity": "sha512-nlmfSlgHBFx36j/Pl/KQPbIaqE8Zf0TqmSMjsuddHDg6PMSVgmyW9HpkLs0o0M1n2GIZ/S2BZBLIww/xjhiGng==", "integrity": "sha512-o+nZr+vtJtgPNklyeUKkkH42OsK8WAfdgaJE2FNxcjLPg+5QbeEoT6vRj8Xq/iv18JlQ9cmKsEu0b94ixWf1YQ==",
"dev": true, "dev": true,
"optional": true, "optional": true,
"requires": { "requires": {
@ -12384,13 +12382,13 @@
} }
}, },
"roarr": { "roarr": {
"version": "2.14.5", "version": "2.14.6",
"resolved": "https://registry.npmjs.org/roarr/-/roarr-2.14.5.tgz", "resolved": "https://registry.npmjs.org/roarr/-/roarr-2.14.6.tgz",
"integrity": "sha512-jwwW1NEYh06O+teTDJt4ETtLdxb3BBir0vThgQQGz88bYypRv69jQhMVRKI8Ps/6LeqsRBGe28V3Awjy38LFoQ==", "integrity": "sha512-qjbw0BEesKA+3XFBPt+KVe1PC/Z6ShfJ4wPlx2XifqH5h2Lj8/KQT5XJTsy3n1Es5kai+BwKALaECW3F70B1cg==",
"dev": true, "dev": true,
"optional": true, "optional": true,
"requires": { "requires": {
"boolean": "^2.0.3", "boolean": "^3.0.0",
"detect-node": "^2.0.4", "detect-node": "^2.0.4",
"globalthis": "^1.0.0", "globalthis": "^1.0.0",
"json-stringify-safe": "^5.0.1", "json-stringify-safe": "^5.0.1",
@ -13777,9 +13775,9 @@
} }
}, },
"sumchecker": { "sumchecker": {
"version": "3.0.0", "version": "3.0.1",
"resolved": "https://registry.npmjs.org/sumchecker/-/sumchecker-3.0.0.tgz", "resolved": "https://registry.npmjs.org/sumchecker/-/sumchecker-3.0.1.tgz",
"integrity": "sha512-yreseuC/z4iaodVoq07XULEOO9p4jnQazO7mbrnDSvWAU/y2cbyIKs+gWJptfcGu9R+1l27K8Rkj0bfvqnBpgQ==", "integrity": "sha512-MvjXzkz/BOfyVDkG0oFOtBxHX2u3gKbMHIF/dXblZsgD3BWOFLmHovIpZY7BykJdAjcqRCBi1WYBNdEC9yI7vg==",
"dev": true, "dev": true,
"requires": { "requires": {
"debug": "^4.1.0" "debug": "^4.1.0"

View File

@ -103,7 +103,7 @@
"cross-env": "^5.2.1", "cross-env": "^5.2.1",
"detect-browser": "^4.6.0", "detect-browser": "^4.6.0",
"devtron": "^1.4.0", "devtron": "^1.4.0",
"electron": "^7.1.1", "electron": "^7.1.7",
"electron-builder": "^21.2.0", "electron-builder": "^21.2.0",
"electron-debug": "^3.0.1", "electron-debug": "^3.0.1",
"electron-devtools-installer": "^2.2.4", "electron-devtools-installer": "^2.2.4",