From 4d3eb2887c20a7b9f74b94a690ae8abe52aa378a Mon Sep 17 00:00:00 2001 From: Alexis Svinartchouk Date: Mon, 4 May 2020 13:37:29 +0200 Subject: [PATCH 1/8] Fix notification icon path Changelog-entry: Fix notification icon path Change-type: patch --- lib/gui/app/pages/main/Flash.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/gui/app/pages/main/Flash.tsx b/lib/gui/app/pages/main/Flash.tsx index 9a3f33a7..ee0bef13 100644 --- a/lib/gui/app/pages/main/Flash.tsx +++ b/lib/gui/app/pages/main/Flash.tsx @@ -90,7 +90,7 @@ async function flashImageToDrive( // otherwise Windows throws EPERM driveScanner.stop(); - const iconPath = '../../assets/icon.png'; + const iconPath = path.join('..', '..', '..', 'assets', 'icon.png'); const basename = path.basename(image.path); try { await imageWriter.flash(image.path, drives, sourceOptions); From f84cde7d0403060f1bdffe176ec91a999768b566 Mon Sep 17 00:00:00 2001 From: Alexis Svinartchouk Date: Mon, 4 May 2020 13:41:59 +0200 Subject: [PATCH 2/8] Update etcher-sdk to ^4.0.1 Change-type: patch --- npm-shrinkwrap.json | 20 +++++++------------- package.json | 2 +- 2 files changed, 8 insertions(+), 14 deletions(-) diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index 3cb806f6..996c2cf6 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -5438,9 +5438,9 @@ "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==" }, "etcher-sdk": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/etcher-sdk/-/etcher-sdk-4.0.0.tgz", - "integrity": "sha512-yzvZEoZkGO+QnpSRF7VTsNAMxnXTgdWoPOUUg62DVRrCJSIFOBrRYHfCfSCih20qHNlQnFuWKjJgFiDdMjfKJA==", + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/etcher-sdk/-/etcher-sdk-4.0.1.tgz", + "integrity": "sha512-qC1hjGwYP2FqA1EfbQ7pgGvg+2wrw+YbQUc+R73cQyKaKM/aMxc0tHEek+ufJjLMJtc8gyCeHUFB7nFVaP/0SQ==", "requires": { "@ronomon/direct-io": "^3.0.1", "axios": "^0.19.2", @@ -5460,7 +5460,6 @@ "partitioninfo": "^5.3.4", "resin-image-fs": "^5.0.8", "rwmutex": "^1.0.0", - "speedometer": "^1.0.0", "udif": "^0.17.0", "unbzip2-stream": "github:balena-io-modules/unbzip2-stream#942fc218013c14adab01cf693b0500cf6ac83193", "unzip-stream": "^0.3.0", @@ -8861,9 +8860,9 @@ } }, "mkdirp-classic": { - "version": "0.5.2", - "resolved": "https://registry.npmjs.org/mkdirp-classic/-/mkdirp-classic-0.5.2.tgz", - "integrity": "sha512-ejdnDQcR75gwknmMw/tx02AuRs8jCtqFoFqDZMjiNxsu85sRIJVXDKHuLYvUUPRBUtV2FpSZa9bL1BUa3BdR2g==" + "version": "0.5.3", + "resolved": "https://registry.npmjs.org/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz", + "integrity": "sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==" }, "mocha": { "version": "7.0.1", @@ -12344,11 +12343,6 @@ "webdriverio": "^4.13.0" } }, - "speedometer": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/speedometer/-/speedometer-1.1.0.tgz", - "integrity": "sha512-z/wAiTESw2XVPssY2XRcme4niTc4S5FkkJ4gknudtVoc33Zil8TdTxHy5torRcgqMqksJV2Yz8HQcvtbsnw0mQ==" - }, "split": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/split/-/split-1.0.1.tgz", @@ -14480,4 +14474,4 @@ } } } -} +} \ No newline at end of file diff --git a/package.json b/package.json index 0e9707db..e32dfabf 100644 --- a/package.json +++ b/package.json @@ -55,7 +55,7 @@ "d3": "^4.13.0", "debug": "^3.1.0", "electron-updater": "4.0.6", - "etcher-sdk": "^4.0.0", + "etcher-sdk": "^4.0.1", "flexboxgrid": "^6.3.0", "immutable": "^3.8.1", "inactivity-timer": "^1.0.0", From eb47f1227adfe3f142260c96a8e20ed6d28cd34a Mon Sep 17 00:00:00 2001 From: Alexis Svinartchouk Date: Mon, 4 May 2020 14:03:51 +0200 Subject: [PATCH 3/8] Fix libpango dependency name on debian Change-type: patch --- electron-builder.yml | 2 +- scripts/resin | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/electron-builder.yml b/electron-builder.yml index 7fbeff85..a3384ab2 100644 --- a/electron-builder.yml +++ b/electron-builder.yml @@ -91,7 +91,7 @@ deb: - libnotify4 - libnspr4 - libnss3 - - libpango1.0-0 + - libpango1.0-0 | libpango-1.0-0 - libstdc++6 - libx11-6 - libxcomposite1 diff --git a/scripts/resin b/scripts/resin index d067a69b..5e5a5555 160000 --- a/scripts/resin +++ b/scripts/resin @@ -1 +1 @@ -Subproject commit d067a69bae5b1b91263f541e0015c214bd414ec8 +Subproject commit 5e5a5555411f395d7d341f255008834a7e21856b From 5de4fe3d235172fe271e89c22ecb0cd45efd489b Mon Sep 17 00:00:00 2001 From: Alexis Svinartchouk Date: Mon, 4 May 2020 17:14:30 +0200 Subject: [PATCH 4/8] Don't depend on lsb for the rpm package Change-type: patch --- electron-builder.yml | 3 +-- scripts/resin | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/electron-builder.yml b/electron-builder.yml index a3384ab2..52f373b6 100644 --- a/electron-builder.yml +++ b/electron-builder.yml @@ -107,5 +107,4 @@ deb: - polkit-1-auth-agent | policykit-1-gnome | polkit-kde-1 rpm: depends: - - lsb - - libXScrnSaver + - util-linux diff --git a/scripts/resin b/scripts/resin index 5e5a5555..862ad8d5 160000 --- a/scripts/resin +++ b/scripts/resin @@ -1 +1 @@ -Subproject commit 5e5a5555411f395d7d341f255008834a7e21856b +Subproject commit 862ad8d53e091ba2ffc580c133b36e04084c8a5b From ebd37b9e2f6968bce0a41a05abac8cfe3ab161c4 Mon Sep 17 00:00:00 2001 From: Rich Morin Date: Wed, 2 Oct 2019 13:10:57 -0700 Subject: [PATCH 5/8] Correct two nomenclature errors PC keyboards have "Alt" keys; Mac keyboards have "Opt" keys. Although it's possible to use a PC keyboard on a Mac, it's unusual. In any case, all of the macOS (not "Mac OS" for some years now) documentation refers to the "Opt" key. Change-type: patch --- .github/ISSUE_TEMPLATE.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md index 1d634403..9d003a45 100644 --- a/.github/ISSUE_TEMPLATE.md +++ b/.github/ISSUE_TEMPLATE.md @@ -3,4 +3,4 @@ - **Image flashed:** - **Do you see any meaningful error information in the DevTools?** - + From ea11f179542794294f773f503d83dad3a10cda56 Mon Sep 17 00:00:00 2001 From: Tom Date: Wed, 9 Oct 2019 09:40:47 -0400 Subject: [PATCH 6/8] docs: Including Arch / Manjaro install instructions Changelog-entry: Including Arch / Manjaro install instructions Change-type: patch Signed-off-by: Tom Carrio --- README.md | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/README.md b/README.md index c0a190b9..6a80dcc3 100644 --- a/README.md +++ b/README.md @@ -105,6 +105,21 @@ sudo eopkg it etcher sudo eopkg rm etcher ``` +#### Arch Linux / Manjaro (GNU/Linux x64) + +Etcher is offered through the Arch User Repository and can be installed on both Manjaro and Arch systems. You can compile it from the source code in this repository using [`balena-etcher`](https://aur.archlinux.org/packages/balena-etcher/) or use the latest release with [`etcher-bin`](https://aur.archlinux.org/packages/etcher-bin/). The following example uses a common AUR helper to install the latest release: + + +```sh +yay -S etcher-bin +``` + +##### Uninstall + +```sh +yay -R etcher-bin +``` + #### Brew Cask (macOS) Note that the Etcher Cask has to be updated manually to point to new versions, From 49491b9b8c34ac7bcdbc1b957f50ee676100084e Mon Sep 17 00:00:00 2001 From: TheRealTachyon Date: Sat, 30 Nov 2019 18:20:54 -0700 Subject: [PATCH 7/8] Update to README.md Just a simple addition of instructionsfor proper installation on OpenSUSE Linux. Change-type: patch --- README.md | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/README.md b/README.md index 6a80dcc3..2d68a954 100644 --- a/README.md +++ b/README.md @@ -59,6 +59,21 @@ sudo apt-get remove balena-etcher-electron sudo rm /etc/apt/sources.list.d/balena-etcher.list sudo apt-get update ``` + +##### OpenSUSE LEAP & Tumbleweed install + +```sh +sudo zypper ar https://balena.io/etcher/static/etcher-rpm.repo +sudo zypper ref +sudo zypper in balena-etcher-electron +``` + +##### Uninstall + +```sh +sudo zypper rm balena-etcher-electron +``` + #### Redhat (RHEL) and Fedora based Package Repository (GNU/Linux x86/x64) 1. Add Etcher rpm repository: From 7971a003cc2d86d31839407ea87d1e27e2eba653 Mon Sep 17 00:00:00 2001 From: Alexis Svinartchouk Date: Mon, 4 May 2020 19:10:09 +0200 Subject: [PATCH 8/8] Update copyright years Change-type: patch --- .resinci.json | 2 +- electron-builder.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.resinci.json b/.resinci.json index 9b47bc91..881d51be 100644 --- a/.resinci.json +++ b/.resinci.json @@ -14,7 +14,7 @@ }, "builder": { "appId": "io.balena.etcher", - "copyright": "Copyright 2016-2019 Balena Ltd", + "copyright": "Copyright 2016-2020 Balena Ltd", "productName": "balenaEtcher", "nodeGypRebuild": true, "afterPack": "./afterPack.js", diff --git a/electron-builder.yml b/electron-builder.yml index 52f373b6..957e8aff 100644 --- a/electron-builder.yml +++ b/electron-builder.yml @@ -1,5 +1,5 @@ appId: io.balena.etcher -copyright: Copyright 2016-2019 Balena Ltd +copyright: Copyright 2016-2020 Balena Ltd productName: balenaEtcher npmRebuild: true nodeGypRebuild: true