Merge pull request #3140 from balena-io/1.5.84

1.5.84

.github/ISSUE_TEMPLATE.md

@@ -3,4 +3,4 @@
 - **Image flashed:** 
 - **Do you see any meaningful error information in the DevTools?** 
 
-<!-- You can open DevTools by pressing `Ctrl+Shift+I` (`Ctrl+Alt+I` for Etcher before v1.3.x), or `Cmd+Alt+I` if you're on Mac OS. -->
+<!-- You can open DevTools by pressing `Ctrl+Shift+I` (`Ctrl+Alt+I` for Etcher before v1.3.x), or `Cmd+Opt+I` if you're on macOS. -->

.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",

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:
@@ -105,6 +120,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,

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
@@ -91,7 +91,7 @@ deb:
     - libnotify4
     - libnspr4
     - libnss3
-    - libpango1.0-0
+    - libpango1.0-0 | libpango-1.0-0
     - libstdc++6
     - libx11-6
     - libxcomposite1
@@ -107,5 +107,4 @@ deb:
     - polkit-1-auth-agent | policykit-1-gnome | polkit-kde-1
 rpm:
   depends:
-    - lsb
-    - libXScrnSaver
+    - util-linux

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);

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 @@
       }
     }
   }
-}
+}

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",

scripts/resin

@@ -1 +1 @@
-Subproject commit d067a69bae5b1b91263f541e0015c214bd414ec8
+Subproject commit 862ad8d53e091ba2ffc580c133b36e04084c8a5b