From 4c2da82ff447e7e1114109820aef5b853f1ee03c Mon Sep 17 00:00:00 2001 From: Amaury Martiny Date: Mon, 25 Jun 2018 18:47:33 +0200 Subject: [PATCH 1/4] Open window on start --- packages/fether-electron/src/main/index.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/fether-electron/src/main/index.js b/packages/fether-electron/src/main/index.js index 76bf3d8e..267f9b5d 100644 --- a/packages/fether-electron/src/main/index.js +++ b/packages/fether-electron/src/main/index.js @@ -44,6 +44,9 @@ const menubar = Mb({ function createWindow () { pino.info(`Starting ${productName}...`); + // Show window on start + menubar.showWindow(); + doesParityExist() .catch(() => fetchParity(menubar.window)) // Install parity if not present .then(() => runParity(menubar.window)) @@ -77,7 +80,8 @@ function createWindow () { } // Right click menu for Tray -menubar.on('after-create-window', () => { +menubar.on('after-create-window', function () { + // Add right-click menu const contextMenu = Menu.buildFromTemplate([ { role: 'about' }, { type: 'separator' }, -- GitLab From f87f89b58f276f9487cc310fba4ebf4f07dc5e2e Mon Sep 17 00:00:00 2001 From: Amaury Martiny Date: Mon, 25 Jun 2018 18:47:53 +0200 Subject: [PATCH 2/4] Install wine on linux --- .travis.yml | 1 + scripts/installWine.sh | 7 +++++++ 2 files changed, 8 insertions(+) create mode 100644 scripts/installWine.sh diff --git a/.travis.yml b/.travis.yml index 6202fd06..2365f5b9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,6 +5,7 @@ cache: before_install: - curl -o- -L https://yarnpkg.com/install.sh | bash # Travis's default version is 1.3.2, we need 1.4.2 for nohoist - export PATH=$HOME/.yarn/bin:$PATH + - scripts/installWine.sh install: - yarn install language: node_js diff --git a/scripts/installWine.sh b/scripts/installWine.sh new file mode 100644 index 00000000..b1c59233 --- /dev/null +++ b/scripts/installWine.sh @@ -0,0 +1,7 @@ +#!/bin/sh + +# Install wine on Linux to build Windows binaries +if [ "$TRAVIS_OS_NAME" = "linux" ]; then + sudo apt-get update + sudo apt-get install -y wine-stable +fi -- GitLab From f99b0a718a0203f0c45c7fa89d6010f28c917808 Mon Sep 17 00:00:00 2001 From: Amaury Martiny Date: Mon, 25 Jun 2018 18:49:59 +0200 Subject: [PATCH 3/4] Make script executable --- scripts/installWine.sh | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 scripts/installWine.sh diff --git a/scripts/installWine.sh b/scripts/installWine.sh old mode 100644 new mode 100755 -- GitLab From e24fb60d0e8c5155da4230368d8f3a04337bf28a Mon Sep 17 00:00:00 2001 From: Amaury Martiny Date: Mon, 25 Jun 2018 19:04:34 +0200 Subject: [PATCH 4/4] Add sudo --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 2365f5b9..2da78dd1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,6 +2,7 @@ cache: yarn: true directories: - node_modules +sudo: required before_install: - curl -o- -L https://yarnpkg.com/install.sh | bash # Travis's default version is 1.3.2, we need 1.4.2 for nohoist - export PATH=$HOME/.yarn/bin:$PATH -- GitLab