diff --git a/app/modules/plugin.js b/app/modules/plugin.js index 4f974dc8df74ad06dde81e6434cba909cf4478e9..42ef263f07f452a90b853361c9ab94d256e89cc5 100644 --- a/app/modules/plugin.js +++ b/app/modules/plugin.js @@ -108,11 +108,11 @@ function npmRemove(what, npm, cwd) { } function getNode() { - return process.argv[0] + return process.argv[0].replace(/(node|nw)$/, 'node') } function getNPM() { - return process.argv[0].replace(/node$/, 'npm') + return process.argv[0].replace(/(node|nw)$/, 'npm') } function getCWD() { diff --git a/gui/index.html b/gui/index.html index ba9ff58516e98af654c7c060396ee265c89c144e..f8f9768b8c5b17a1b6d128253b5a7e8317747622 100644 --- a/gui/index.html +++ b/gui/index.html @@ -53,7 +53,7 @@ let gui = require('nw.gui'); - let packageJSON = require('../../nw/package.json'); + let packageJSON = require(require('path').resolve('./package.json')); function reqListener () { document.getElementById('loader').innerHTML = 'Server ready.'; clearTimeout(strangeTimeout); diff --git a/gui/package.json b/gui/package.json deleted file mode 100644 index 9efcb30ce1a5c168c4083a717f4e23af21c6df33..0000000000000000000000000000000000000000 --- a/gui/package.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "name": "v1.3.3", - "main": "index.html", - "js-flags": "--max_old_space_size=300", - "node-main": "../sources/bin/duniter", - "window": { - "icon": "duniter.png", - "title": "v1.3.3", - "width": 800, - "height": 800, - "min_width": 750, - "min_height": 400 - } -} diff --git a/package.json b/package.json index 1a0c7aacf7c36e191332c58932c2e8a250be5116..9c191bdb8c3b338b0f9e325cb03dfe2a9167b8bb 100644 --- a/package.json +++ b/package.json @@ -9,6 +9,15 @@ "private": false, "description": "Crypto-currency software allowing to build P2P free currencies", "main": "index.js", + "node-main": "../sources/bin/duniter", + "window": { + "icon": "duniter.png", + "title": "v1.3.3", + "width": 800, + "height": 800, + "min_width": 750, + "min_height": 400 + }, "directories": { "test": "test" }, diff --git a/yarn.lock b/yarn.lock index 0f7ab3fb7dd649da93af837700827f211c38327a..5077ce09aec40b561eb6ec9b925b6b05fce7530f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -808,8 +808,8 @@ duniter-prover@^1.3.3: underscore "1.8.3" duniter-ui@1.3.x: - version "1.3.7" - resolved "https://registry.yarnpkg.com/duniter-ui/-/duniter-ui-1.3.7.tgz#f8e012788e3acb728cb9daa5ae176cda99ea5df2" + version "1.3.8" + resolved "https://registry.yarnpkg.com/duniter-ui/-/duniter-ui-1.3.8.tgz#67f790c2c06ca93b92a9d84c0b0ebb3238b1d153" dependencies: adm-zip "0.4.7" body-parser "1.17.1" @@ -924,11 +924,11 @@ escape-html@~1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988" -escape-string-regexp@1.0.2, escape-string-regexp@^1.0.2: +escape-string-regexp@1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.2.tgz#4dbc2fe674e71949caf3fb2695ce7f2dc1d9a8d1" -escape-string-regexp@^1.0.5: +escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5: version "1.0.5" resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4" @@ -1760,12 +1760,6 @@ jison@0.4.17: lex-parser "~0.1.3" nomnom "1.5.2" -jodid25519@^1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/jodid25519/-/jodid25519-1.0.2.tgz#06d4912255093419477d425633606e0e90782967" - dependencies: - jsbn "~0.1.0" - jquery@^2.1.4: version "2.2.4" resolved "https://registry.yarnpkg.com/jquery/-/jquery-2.2.4.tgz#2c89d6889b5eac522a7eea32c14521559c6cbf02" @@ -2549,8 +2543,8 @@ rechoir@^0.6.2: resolve "^1.1.6" remove-trailing-separator@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.0.1.tgz#615ebb96af559552d4bf4057c8436d486ab63cc4" + version "1.0.2" + resolved "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.0.2.tgz#69b062d978727ad14dc6b56ba4ab772fd8d70511" repeat-string@^1.5.2: version "1.6.1" @@ -2901,8 +2895,8 @@ sqlite3@3.1.4: node-pre-gyp "~0.6.28" sshpk@^1.7.0: - version "1.13.0" - resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.13.0.tgz#ff2a3e4fd04497555fed97b39a0fd82fafb3a33c" + version "1.13.1" + resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.13.1.tgz#512df6da6287144316dc4c18fe1cf1d940739be3" dependencies: asn1 "~0.2.3" assert-plus "^1.0.0" @@ -2911,7 +2905,6 @@ sshpk@^1.7.0: optionalDependencies: bcrypt-pbkdf "^1.0.0" ecc-jsbn "~0.1.1" - jodid25519 "^1.0.0" jsbn "~0.1.0" tweetnacl "~0.14.0"