From 4b518d66fd292fc3340cba8e60937044e057e936 Mon Sep 17 00:00:00 2001 From: Amaury Martiny Date: Fri, 16 Mar 2018 14:23:21 +0100 Subject: [PATCH 1/3] Change config of electron app --- package.electron.json | 9 +++++++-- package.json | 2 +- src/index.electron.js | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/package.electron.json b/package.electron.json index 5d50e01..6bb3c2e 100644 --- a/package.electron.json +++ b/package.electron.json @@ -1,5 +1,5 @@ { - "appId": "com.parity.ui", + "appId": "io.parity.ui", "directories": { "buildResources": "./" }, @@ -15,8 +15,13 @@ "category": "public.app-category.productivity", "icon": "./assets/icon/small-white-512x512.png" }, + "nsis": { + "allowToChangeInstallationDirectory": true, + "onClick": false + }, "productName": "Parity UI", "win": { - "icon": "./assets/icon/small-white-512x512.png" + "icon": "./assets/icon/small-white-512x512.png", + "target": "nsis" } } \ No newline at end of file diff --git a/package.json b/package.json index dbc875b..3cdc46e 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,7 @@ "main": ".build/electron.js", "jsnext:main": ".build/electron.js", "author": { - "name": "Parity Team", + "name": "Parity Technologies", "email": "admin@parity.io" }, "maintainers": [ diff --git a/src/index.electron.js b/src/index.electron.js index ca8d3b1..9d851e0 100644 --- a/src/index.electron.js +++ b/src/index.electron.js @@ -160,7 +160,7 @@ function createWindow () { session.defaultSession.webRequest.onBeforeSendHeaders({ urls: ['ws://*/*', 'wss://*/*'] }, (details, callback) => { - details.requestHeaders.Origin = `parity://${mainWindow.id}.wallet.parity`; + details.requestHeaders.Origin = `parity://${mainWindow.id}.ui.parity`; callback({ requestHeaders: details.requestHeaders }); }); -- GitLab From f7b68741abd3f0018f35ef69fa3fb10a0b9dac4a Mon Sep 17 00:00:00 2001 From: Amaury Martiny Date: Fri, 16 Mar 2018 14:33:52 +0100 Subject: [PATCH 2/3] Change windows default install dir --- src/util/windowInstaller.nsh | 10 ++++++++++ webpack/electron.js | 6 +++++- 2 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 src/util/windowInstaller.nsh diff --git a/src/util/windowInstaller.nsh b/src/util/windowInstaller.nsh new file mode 100644 index 0000000..35434cd --- /dev/null +++ b/src/util/windowInstaller.nsh @@ -0,0 +1,10 @@ +; Change default install directory on Windows +; https://www.electron.build/configuration/nsis#how-do-change-the-default-installation-directory-to-custom +macro preInit + SetRegView 64 + WriteRegExpandStr HKLM "${INSTALL_REGISTRY_KEY}" InstallLocation "C:\Program Files\Parity Technologies\Parity UI" + WriteRegExpandStr HKCU "${INSTALL_REGISTRY_KEY}" InstallLocation "C:\Program Files\Parity Technologies\Parity UI" + SetRegView 32 + WriteRegExpandStr HKLM "${INSTALL_REGISTRY_KEY}" InstallLocation "C:\Program Files\Parity Technologies\Parity UI" + WriteRegExpandStr HKCU "${INSTALL_REGISTRY_KEY}" InstallLocation "C:\Program Files\Parity Technologies\Parity UI" +!macroend diff --git a/webpack/electron.js b/webpack/electron.js index 907e3cc..debab77 100644 --- a/webpack/electron.js +++ b/webpack/electron.js @@ -16,6 +16,7 @@ // along with Parity. If not, see . const path = require('path'); +const CopyWebpackPlugin = require('copy-webpack-plugin'); const rulesEs6 = require('./rules/es6'); const rulesParity = require('./rules/parity'); @@ -57,5 +58,8 @@ module.exports = { ] }, - plugins: Shared.getPlugins() + plugins: Shared.getPlugins().concat(new CopyWebpackPlugin([{ + from: path.join(__dirname, '../src/util/windowInstaller.nsh'), + to: 'installer.nsh' + }])) }; -- GitLab From d98e9edfe0d7b76b027acf1c506a0d26faf01e14 Mon Sep 17 00:00:00 2001 From: Amaury Martiny Date: Fri, 16 Mar 2018 15:25:24 +0100 Subject: [PATCH 3/3] Include windows installer script --- package.electron.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package.electron.json b/package.electron.json index 6bb3c2e..2c6c7c6 100644 --- a/package.electron.json +++ b/package.electron.json @@ -17,7 +17,8 @@ }, "nsis": { "allowToChangeInstallationDirectory": true, - "onClick": false + "include": "installer.nsh", + "oneClick": false }, "productName": "Parity UI", "win": { -- GitLab