From 8c563fb751b9f817e3d6f434e197a09ece3e4a54 Mon Sep 17 00:00:00 2001
From: Dominik Honnef <dominik@honnef.co>
Date: Sat, 21 Nov 2015 15:02:00 +0100
Subject: [PATCH] spotify: correctly download client on i686, improve error
 reporting

---
 srcpkgs/spotify/INSTALL  | 13 +++++++------
 srcpkgs/spotify/template |  2 +-
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/spotify/INSTALL b/srcpkgs/spotify/INSTALL
index 6a9f25732a2..e6f6d2d1ace 100644
--- a/srcpkgs/spotify/INSTALL
+++ b/srcpkgs/spotify/INSTALL
@@ -13,18 +13,19 @@ if test "$ACTION" = "post"; then
 	. /usr/share/spotify/pkgdata
 	mkdir -p "$_BUILDDIR"
 	(
+		set -e
 		cd "$_BUILDDIR"
 		xbps-uhelper fetch "http://repository.spotify.com/pool/non-free/s/spotify/spotify-client_${SVERSION}.deb"
 		echo "${SCHECKSUM}  spotify-client_${SVERSION}.deb" >checksum
-		sha256sum -c checksum || exit 1
+		sha256sum -c checksum
 		ar x "spotify-client_${SVERSION}.deb"
-		[ -f data.tar.gz ] && tar xzf data.tar.gz 2>/dev/null
-		[ -f data.tar.xz ] && tar xJf data.tar.xz 2>/dev/null
-	) || {
-		echo Error while extracting;
+		tar -xf data.tar.*
+	)
+	if [ $? -ne 0 ] ; then
+		echo "Failed downloading spotify client"
 		rm -r "$_BUILDDIR";
 		exit 1;
-	}
+	fi
 	mkdir -p /usr/share/licenses/spotify
 	mv "${_BUILDDIR}/usr/share/doc/spotify-client/copyright" /usr/share/licenses/spotify/
 
diff --git a/srcpkgs/spotify/template b/srcpkgs/spotify/template
index fcb45f47486..331763dc142 100644
--- a/srcpkgs/spotify/template
+++ b/srcpkgs/spotify/template
@@ -1,7 +1,7 @@
 # Template build file for 'spotify'.
 pkgname=spotify
 version=0.9
-revision=8
+revision=9
 short_desc="Proprietary music streaming client"
 maintainer="Stefan Mühlinghaus <jazzman@alphabreed.com>"
 homepage="https://www.spotify.com"