diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e2401bc57..886470d21 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -98,9 +98,8 @@ publish:snap: variables: BUILD_ARCH: amd64 before_script: - - export VERSION=$(node -p "require('./package.json').version") + - export VERSION=$(grep -m 1 "version" package.json | awk '{print $2}' | tr -d '",' | tr -d "\n")&&echo "Version:" $VERSION script: - scripts/publish-snap.sh tags: - rust-stable -#test PR check1 diff --git a/electron/fetchParity/index.js b/electron/fetchParity/index.js index dce5255b4..bd2d82ccb 100644 --- a/electron/fetchParity/index.js +++ b/electron/fetchParity/index.js @@ -62,7 +62,7 @@ module.exports = (mainWindow) => { // Fetching from https://vanity-service.parity.io/parity-binaries return fsExists(parityPath()) .catch(() => axios.get(`https://vanity-service.parity.io/parity-binaries?version=${channel}&os=${getOs()}&architecture=${getArch()}`) - .then((response) => response.data[0].files.find(({ name }) => name === 'parity')) + .then((response) => response.data[0].files.find(({ name }) => name === 'parity' || name === 'parity.exe')) .then(({ downloadUrl }) => download( mainWindow, downloadUrl, diff --git a/electron/installers/windows/windowInstaller.nsh b/electron/installers/windows/installer.nsh similarity index 100% rename from electron/installers/windows/windowInstaller.nsh rename to electron/installers/windows/installer.nsh diff --git a/electron/util/parityPath.js b/electron/util/parityPath.js index b95352ddb..325318fcf 100644 --- a/electron/util/parityPath.js +++ b/electron/util/parityPath.js @@ -16,7 +16,7 @@ const { app } = require('electron'); -const parityPath = `${app.getPath('userData')}/parity`; +const parityPath = `${app.getPath('userData')}/parity${process.platform === 'win32' ? '.exe' : ''}`; // TODO parityPath is now in the Application Data folder by default, it would // be nice to first look if /usr/bin/parity exists (and return that as