update to 6.0.11647.433

3 files changed, 35 insertions, 11 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 725e804edabc..caf7aa9d01a3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,13 +1,14 @@
 pkgbase = beam-wallet-bin
 	pkgdesc = Beam Desktop GUI Wallet
-	pkgver = 5.3.10410.3657
+	pkgver = 6.0.11647.433
 	pkgrel = 1
 	url = https://beam.mw
 	arch = x86_64
 	license = Apache
-	conflicts = beamwallet-bin
-	source = https://builds.beam.mw/mainnet/2021.02.25/Release/linux/Beam-Wallet-5.3.10410.3657.deb
-	sha256sums = b4f9b07657b9980321c508f61045be9b6b967b4d6037896f1b1b100cd07601ab
+	source = beam-wallet-bin-6.0.11647.433.tar::https://github.com/BeamMW/beam-ui/releases/download/beam-6.0.11647.4336/Beam-Wallet-6.0.11647.433.tar
+	source = beam-wallet-bin-6.0.11647.433.tar.asc::https://github.com/BeamMW/beam-ui/releases/download/beam-6.0.11647.4336/Beam-Wallet-6.0.11647.433.tar.asc
+	validpgpkeys = 9FEC539DB8E4EA8B
+	sha256sums = ebeac2f165f8ec723cfe1cfc4c3e0a902c3f75f6cfc46ab804938868acd6c3eb
+	sha256sums = SKIP
 
 pkgname = beam-wallet-bin
-
diff --git a/PKGBUILD b/PKGBUILD
index 4cb81f06dc61..007c90641572 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,16 +1,35 @@
-# Maintainer: Aleksey Barinov
+# Maintainer: Luis Martinez <luis dot martinez at tuta dot io>
+# Contributor: Aleksey Barinov
 
 pkgname=beam-wallet-bin
-pkgver=5.3.10410.3657
+pkgver=6.0.11647.433
 pkgrel=1
 pkgdesc="Beam Desktop GUI Wallet"
 arch=('x86_64')
 license=('Apache')
 url='https://beam.mw'
-conflicts=('beamwallet-bin')
-source=("https://builds.beam.mw/mainnet/2021.02.25/Release/linux/Beam-Wallet-${pkgver}.deb")
-sha256sums=('b4f9b07657b9980321c508f61045be9b6b967b4d6037896f1b1b100cd07601ab')
+source=("$pkgname-$pkgver.tar::https://github.com/BeamMW/beam-ui/releases/download/beam-6.0.11647.4336/Beam-Wallet-$pkgver.tar"
+        "$pkgname-$pkgver.tar.asc::https://github.com/BeamMW/beam-ui/releases/download/beam-6.0.11647.4336/Beam-Wallet-$pkgver.tar.asc"
+        'beam-wallet.sh')
+sha256sums=('ebeac2f165f8ec723cfe1cfc4c3e0a902c3f75f6cfc46ab804938868acd6c3eb'
+            'SKIP'
+            'eb87b1db8013d2c6159e943d9f2420ce5a1b8b32e8a2a7c991efb717ce67faad')
+validpgpkeys=('9FEC539DB8E4EA8B')
+
+prepare() {
+	"./BeamWallet-${pkgver}6.AppImage" --appimage-extract &> /dev/null
+	cd squashfs-root
+	sed -i "/Exec/s/\/usr/\/opt\/$pkgname\/usr/" BeamWallet.desktop
+	echo "Path=/opt/$pkgname/" >> BeamWallet.desktop
+}
 
 package() {
-    tar -xf "${srcdir}/data.tar.gz" -C "${pkgdir}"
+	install -Dm755 beam-wallet.sh "$pkgdir/usr/bin/beam-wallet"
+	cd squashfs-root
+	install -Dm644 beam.png -t "$pkgdir/usr/share/icons/hicolor/256x256/apps/"
+	install -Dm644 BeamWallet.desktop "$pkgdir/usr/share/applications/beam-wallet.desktop"
+	rm beam.png BeamWallet.desktop AppRun
+	install -d "$pkgdir/opt/$pkgname/"
+	rm -rf usr/share
+	cp -a --no-preserve=ownership * "$pkgdir/opt/$pkgname/"
 }
diff --git a/beam-wallet.sh b/beam-wallet.sh
new file mode 100644
index 000000000000..f885f396ecf0
--- /dev/null
+++ b/beam-wallet.sh
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+cd /opt/beam-wallet-bin/
+exec /opt/beam-wallet-bin/usr/bin/BeamWallet "$@"