From 94a7dbaf1fcd0624377bc96ef31fe798ade32c4f Mon Sep 17 00:00:00 2001 From: Amaury Martiny Date: Mon, 19 Mar 2018 19:18:30 +0100 Subject: [PATCH 1/3] Do not allow per-user installation on windows --- package.electron.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.electron.json b/package.electron.json index c220dc0..7b54108 100644 --- a/package.electron.json +++ b/package.electron.json @@ -16,9 +16,9 @@ "icon": "./assets/icon/small-white-512x512.png" }, "nsis": { - "allowToChangeInstallationDirectory": true, "include": "./.build/installer.nsh", - "oneClick": false + "oneClick": true, + "perMachine": true }, "productName": "Parity UI", "win": { -- GitLab From b048a486c6b1d303f524865d4e71f735fb066994 Mon Sep 17 00:00:00 2001 From: Amaury Martiny Date: Mon, 19 Mar 2018 19:41:59 +0100 Subject: [PATCH 2/3] Add .tar.xz on linux --- .travis.yml | 1 + package.electron.json | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index f0f5c4c..8ec0e02 100644 --- a/.travis.yml +++ b/.travis.yml @@ -30,6 +30,7 @@ deploy: - ./dist/parity-ui_0.1.0_amd64.deb - ./dist/parity-ui_0.1.0_amd64.snap - ./dist/parity-ui-0.1.0-x86_64.AppImage + - ./dist/parity-ui-0.1.0.tar.xz skip_cleanup: true on: condition: $TRAVIS_OS_NAME = linux diff --git a/package.electron.json b/package.electron.json index 7b54108..bf893ca 100644 --- a/package.electron.json +++ b/package.electron.json @@ -8,7 +8,8 @@ "target": [ "AppImage", "snap", - "deb" + "deb", + "tar.xz" ] }, "mac": { -- GitLab From b46b831db3c2225ccef5d842226dc70b99f42b40 Mon Sep 17 00:00:00 2001 From: Amaury Martiny Date: Mon, 19 Mar 2018 19:42:55 +0100 Subject: [PATCH 3/3] Make versions <1.10 work --- src/index.electron.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/index.electron.js b/src/index.electron.js index 9d851e0..eff08de 100644 --- a/src/index.electron.js +++ b/src/index.electron.js @@ -63,7 +63,7 @@ function createWindow () { ipcMain.on('asynchronous-message', (event, arg) => { // Run an instance of parity if we receive the `run-parity` message if (arg === 'run-parity') { - parity = spawn(global.parityInstallLocation); + parity = spawn(global.parityInstallLocation, ['--ws-origins', 'parity://*.ui.parity']); // Argument for retro-compatibility with <1.10 versions } }); -- GitLab