upgpkg: etcher 1.5.5-1

upstream release

3 files changed, 7 insertions, 17 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a3b870e94e6f..11b642eced5f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = etcher
 	pkgdesc = Burn images to SD cards & USB drives, safe & easy
-	pkgver = 1.4.9
+	pkgver = 1.5.5
 	pkgrel = 1
 	url = https://www.balena.io/etcher/
 	arch = x86_64
@@ -9,7 +9,7 @@ pkgbase = etcher
 	makedepends = python2
 	makedepends = git
 	makedepends = jq
-	depends = electron2
+	depends = electron
 	depends = gtk2
 	depends = libxtst
 	depends = libxss
@@ -19,13 +19,13 @@ pkgbase = etcher
 	optdepends = libnotify: for notifications
 	optdepends = speech-dispatcher: for text-to-speech
 	options = !strip
-	source = etcher::git+https://github.com/balena-io/etcher.git#tag=v1.4.9
+	source = etcher::git+https://github.com/balena-io/etcher.git#tag=v1.5.5
 	source = git+https://github.com/balena-io/scripts.git
 	source = etcher-electron
 	source = etcher-electron.desktop
 	sha256sums = SKIP
 	sha256sums = SKIP
-	sha256sums = 58926eb1380e117a5f237d93d3d481a2af4695fa3e7049ae400531c52db87082
+	sha256sums = 4499f316e4de865696312b31545f8df62850aad4492bcc9736cccb6d8eeb96ec
 	sha256sums = 89291532fb6e6c5555b43d61c9ba3df103bca0eace040483884b86fd30dca3e4
 
 pkgname = etcher
diff --git a/PKGBUILD b/PKGBUILD
index 6ea877c604ee..f798588b0e05 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,13 +2,13 @@
 # Contributor: Andrew Stubbs <andrew.stubbs@gmail.com>
 
 pkgname=etcher
-pkgver=1.4.9
+pkgver=1.5.5
 pkgrel=1
 pkgdesc='Burn images to SD cards & USB drives, safe & easy'
 arch=(x86_64)
 url='https://www.balena.io/etcher/'
 license=(apache)
-depends=(electron2 gtk2 libxtst libxss gconf nss alsa-lib)
+depends=(electron gtk2 libxtst libxss gconf nss alsa-lib)
 makedepends=(npm python2 git jq)
 optdepends=('libnotify: for notifications'
             'speech-dispatcher: for text-to-speech')
@@ -27,20 +27,10 @@ prepare() {
   git submodule init
   git config submodule.scripts/resin.url "$srcdir/scripts"
   git submodule update
-
-  # electron --version does not work in a chroot
-  # https://github.com/electron/electron/issues/12621
-  export _electron_version=$(tail -c +2 /usr/lib/electron2/version)
-  mv package.json{,.orig}
-  jq '.devDependencies.electron |= env._electron_version' \
-    package.json.orig > package.json
 }
 
 build() {
   cd "$pkgname"
-
-  # workaround for https://github.com/balena-io/scripts/issues/7
-  export AWS_ACCESS_KEY_ID='' AWS_SECRET_ACCESS_KEY=''
   make electron-develop
   make webpack
   npm prune --production
diff --git a/etcher-electron b/etcher-electron
index 3dccaac84156..c008a968b4a1 100755
--- a/etcher-electron
+++ b/etcher-electron
@@ -1,2 +1,2 @@
 #!/usr/bin/sh
-exec electron2 /usr/lib/etcher/lib/start.js "$@"
+exec electron /usr/lib/etcher/lib/start.js "$@"