[tor-browser-en] pacman 4.2 arch support instead of if/then hacks

pacman 4.2 can support architecture-specific arrays and stuff, so less hacky logic in the pkgbuild now

2 files changed, 27 insertions, 30 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2e258517f24f..a92739e33826 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -28,17 +28,20 @@ pkgbase = tor-browser-en
 	optdepends = gst-libav: h.264 video
 	optdepends = libpulse: PulseAudio audio driver
 	optdepends = libnotify: Gnome dialog boxes
-	noextract = tor-browser-linux64-4.0.4_en-US.tar.xz
-	source = https://www.torproject.org/dist/torbrowser/4.0.4/tor-browser-linux64-4.0.4_en-US.tar.xz
-	source = https://www.torproject.org/dist/torbrowser/4.0.4/tor-browser-linux64-4.0.4_en-US.tar.xz.asc
 	source = tor-browser-en.desktop
 	source = tor-browser-en.png
 	source = tor-browser-en.sh
-	sha256sums = f527b85a057ae402fa1dc84e6c175071e6448300cd2ebdd0d50494e1dd605185
-	sha256sums = e6743ba76720a360e7ff79e73fc8eef4b510b33f530662b082c6c20d4b932e29
 	sha256sums = 3d5fc01f2cfbae0a00b7117b0b0a24028d1686e6f81a347809f74de2d8522ff7
 	sha256sums = 17fc2f5784d080233aca16e788d62ab6fe3e57cf781b123cfe32767de97d6d3b
 	sha256sums = 1c1fbfa21973a2991db8a58f718656fc835dda03257c951432500bbd5dd8d3f5
+	source_x86_64 = https://www.torproject.org/dist/torbrowser/4.0.4/tor-browser-linux64-4.0.4_en-US.tar.xz
+	source_x86_64 = https://www.torproject.org/dist/torbrowser/4.0.4/tor-browser-linux64-4.0.4_en-US.tar.xz.asc
+	sha256sums_x86_64 = 0f0a07905daaf714322bc54cf25ed0e3b8ef91aeb937ab0df2d39010c9ee7b82
+	sha256sums_x86_64 = bb578c05520ed25e0c3223ec409ccf59cb979ceccf26b3ae3ef53ea966f19212
+	source_i686 = https://www.torproject.org/dist/torbrowser/4.0.4/tor-browser-linux32-4.0.4_en-US.tar.xz
+	source_i686 = https://www.torproject.org/dist/torbrowser/4.0.4/tor-browser-linux32-4.0.4_en-US.tar.xz.asc
+	sha256sums_i686 = f527b85a057ae402fa1dc84e6c175071e6448300cd2ebdd0d50494e1dd605185
+	sha256sums_i686 = e6743ba76720a360e7ff79e73fc8eef4b510b33f530662b082c6c20d4b932e29
 
 pkgname = tor-browser-en
 
diff --git a/PKGBUILD b/PKGBUILD
index aaab19d14605..92f558631705 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,8 +6,6 @@
 
 pkgname='tor-browser-en'
 pkgver='4.0.4'
-_realpkgver=$pkgver
-_realpkgver_i686=$pkgver
 _language='en-US'
 pkgrel=1
 pkgdesc='Tor Browser Bundle: Anonymous browsing using firefox and tor'
@@ -25,40 +23,32 @@ optdepends=('zenity: simple dialog boxes'
 			'libnotify: Gnome dialog boxes')
 install="${pkgname}.install"
 
-# Workaround due to different versions depending on CARCH
-if [[ "$CARCH" == 'i686' ]]; then
-	_realpkgver=${_realpkgver_i686}
-	_pkgarch='32'
-else
-	_pkgarch='64'
-fi
-
 validpgpkeys=('8738A680B84B3031A630F2DB416F061063FEE659'
               'EF6E286DDA85EA2A4BA7DE684E2C6E8793298290')
-source=("https://www.torproject.org/dist/torbrowser/${pkgver}/tor-browser-linux${_pkgarch}-${_realpkgver}_${_language}.tar.xz"
-		"https://www.torproject.org/dist/torbrowser/${pkgver}/tor-browser-linux${_pkgarch}-${_realpkgver}_${_language}.tar.xz.asc"
-		"${pkgname}.desktop"
-		"${pkgname}.png"
-		"${pkgname}.sh")
+source_x86_64=("https://www.torproject.org/dist/torbrowser/${pkgver}/tor-browser-linux64-${pkgver}_${_language}.tar.xz"
+               "https://www.torproject.org/dist/torbrowser/${pkgver}/tor-browser-linux64-${pkgver}_${_language}.tar.xz.asc")
+source_i686=("https://www.torproject.org/dist/torbrowser/${pkgver}/tor-browser-linux32-${pkgver}_${_language}.tar.xz"
+             "https://www.torproject.org/dist/torbrowser/${pkgver}/tor-browser-linux32-${pkgver}_${_language}.tar.xz.asc")
+source+=("${pkgname}.desktop"
+         "${pkgname}.png"
+         "${pkgname}.sh")
 
-if [[ "$CARCH" == 'x86_64' ]]; then
-   sha256sums=('0f0a07905daaf714322bc54cf25ed0e3b8ef91aeb937ab0df2d39010c9ee7b82'
-               'bb578c05520ed25e0c3223ec409ccf59cb979ceccf26b3ae3ef53ea966f19212')
-else
-   sha256sums=('f527b85a057ae402fa1dc84e6c175071e6448300cd2ebdd0d50494e1dd605185'
-               'e6743ba76720a360e7ff79e73fc8eef4b510b33f530662b082c6c20d4b932e29')
-fi
+sha256sums_x86_64=('0f0a07905daaf714322bc54cf25ed0e3b8ef91aeb937ab0df2d39010c9ee7b82'
+                   'bb578c05520ed25e0c3223ec409ccf59cb979ceccf26b3ae3ef53ea966f19212')
+sha256sums_i686=('f527b85a057ae402fa1dc84e6c175071e6448300cd2ebdd0d50494e1dd605185'
+                 'e6743ba76720a360e7ff79e73fc8eef4b510b33f530662b082c6c20d4b932e29')
 sha256sums+=('3d5fc01f2cfbae0a00b7117b0b0a24028d1686e6f81a347809f74de2d8522ff7'
 			'17fc2f5784d080233aca16e788d62ab6fe3e57cf781b123cfe32767de97d6d3b'
 			'1c1fbfa21973a2991db8a58f718656fc835dda03257c951432500bbd5dd8d3f5')
 
-noextract=("tor-browser-linux${_pkgarch}-${_realpkgver}_${_language}.tar.xz")
+noextract_x86_64=("tor-browser-linux64-${pkgver}_${_language}.tar.xz")
+noextract_i686=("tor-browser-linux32-${pkgver}_${_language}.tar.xz")
 
 package() {
 	cd "${srcdir}"
 
 	sed -i "s/REPL_NAME/${pkgname}/g"			${pkgname}.sh
-	sed -i "s/REPL_VERSION/${_realpkgver}/g"	${pkgname}.sh
+	sed -i "s/REPL_VERSION/${pkgver}/g"	    ${pkgname}.sh
 	sed -i "s/REPL_LANGUAGE/${_language}/g"		${pkgname}.sh
 
 	sed -i "s/REPL_NAME/${pkgname}/g"			${pkgname}.desktop
@@ -69,7 +59,11 @@ package() {
 	install -Dm 644 ${pkgname}.png		${pkgdir}/usr/share/pixmaps/${pkgname}.png
 	install -Dm 755 ${pkgname}.sh		${pkgdir}/usr/bin/${pkgname}
 
-	install -Dm 644 tor-browser-linux${_pkgarch}-${_realpkgver}_${_language}.tar.xz ${pkgdir}/opt/${pkgname}/tor-browser-linux${_pkgarch}-${_realpkgver}_${_language}.tar.xz
+	if [[ "$CARCH" == 'i686' ]]; then
+		install -Dm 644 tor-browser-linux32-${pkgver}_${_language}.tar.xz ${pkgdir}/opt/${pkgname}/tor-browser-linux32-${pkgver}_${_language}.tar.xz
+	else
+		install -Dm 644 tor-browser-linux64-${pkgver}_${_language}.tar.xz ${pkgdir}/opt/${pkgname}/tor-browser-linux64-${pkgver}_${_language}.tar.xz
+	fi
 }
 
 # vim:set ts=2 sw=2 et: