Merge pull request #86 from parity-js/am-fix-windows

Fix windows (CI & Electron)
parity-js · May 5, 2018 · 219c128 · 219c128
2 parents 8302cdd + 95799dc
commit 219c128
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 4 deletions.
diff --git 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
@@ -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/...on/installers/windows/windowInstaller.nsh → electron/installers/windows/installer.nsh b/...on/installers/windows/windowInstaller.nsh → electron/installers/windows/installer.nsh
diff --git 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