Fix checksums, take CARCH a bit more into account

2 files changed, 28 insertions, 19 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 402075474246..8ec603c49693 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,6 @@
-# Generated by mksrcinfo v8
-# Wed Apr 27 13:11:38 UTC 2016
 pkgbase = firefox-nightly-fr
 	pkgdesc = Standalone Web Browser from Mozilla — Nightly build (fr)
-	pkgver = 49.0a1.20160427
+	pkgver = 49.0a1.20160517
 	pkgrel = 1
 	url = https://nightly.mozilla.org/
 	arch = i686
@@ -21,14 +19,16 @@ pkgbase = firefox-nightly-fr
 	optdepends = ffmpeg: h.264 video
 	optdepends = hunspell: spell checking
 	optdepends = hyphen: hyphenation
-	source = https://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/latest-mozilla-central-l10n/firefox-49.0a1.fr.linux-.tar.bz2
 	source = firefox-nightly.desktop
 	source = firefox-nightly-safe.desktop
 	source = vendor.js
-	sha512sums = 
 	sha512sums = 725babc1365e02a30f50aafbc069b04a97cd247f76240b99b0a734dcce0e560f30cfd441efe9b0b9edcc48f327c8adad34e1ae45c2ba047205c84921d5e43e59
 	sha512sums = 2df6b84978ec459ffad3e0d285c816da07a890db30284d3b2bec250472c10e08003edf705278cb97e02a52fb5f1325d962c08d5fbcf98f484e982a97e381407b
 	sha512sums = bae5a952d9b92e7a0ccc82f2caac3578e0368ea6676f0a4bc69d3ce276ef4f70802888f882dda53f9eb8e52911fb31e09ef497188bcd630762e1c0f5293cc010
+	source_i686 = https://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/latest-mozilla-central-l10n/firefox-49.0a1.fr.linux-i686.tar.bz2
+	sha512sums_i686 = 8cf53aaee0e3f5a2f6e0dc0f5ab4de19a28a069cac9efed1fd9672cd8e01e12beb5f9da52d112b955f67021dbae1125bf6128d28e91c7ef57e239c75505c36e4
+	source_x86_64 = https://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/latest-mozilla-central-l10n/firefox-49.0a1.fr.linux-x86_64.tar.bz2
+	sha512sums_x86_64 = a1f5a2bfbe840fc48c5ba6fc236cad2feeb4b408f840a16cdb118aa0c55e67b7c237a2f91bd0ead1f268902f60422c6d6bc20ab879c38894f26b1549319941d3
 
 pkgname = firefox-nightly-fr
 
diff --git a/PKGBUILD b/PKGBUILD
index dfc7ed381074..2b985f421f71 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -16,7 +16,7 @@ pkgname=firefox-nightly-fr
 pkgdesc='Standalone Web Browser from Mozilla — Nightly build (fr)'
 url='https://nightly.mozilla.org/'
 _version="49.0a1"
-pkgver=49.0a1.20160427
+pkgver=49.0a1.20160517
 pkgrel=1
 arch=('i686' 'x86_64')
 license=('MPL' 'GPL' 'LGPL')
@@ -25,34 +25,43 @@ depends=('alsa-lib' 'dbus-glib' 'desktop-file-utils' 'gtk2' 'gtk3' 'libxt'
 optdepends=('ffmpeg: h.264 video'
             'hunspell: spell checking'
             'hyphen: hyphenation')
-_base_src="${_name}-${_version}.${_lang}.linux-${CARCH}"
-_base_url="https://ftp.mozilla.org/pub/mozilla.org/${_name}/nightly/latest-mozilla-central-l10n"
-_tarball="${_base_src}.tar.bz2"
+_url="https://ftp.mozilla.org/pub/mozilla.org/${_name}/nightly/latest-mozilla-central"
+_url_l10n="${_url}-l10n"
+_src="${_name}-${_version}.${_lang}.linux"
+_file_i686="${_src}-i686.tar.bz2"
+_file_x86_64="${_src}-x86_64.tar.bz2"
+_sums_i686="${_src}-i686.checksums"
+_sums_x86_64="${_src}-x86_64.checksums"
 source=(
-    "${_base_url}/${_tarball}"
     'firefox-nightly.desktop'
     'firefox-nightly-safe.desktop'
     'vendor.js'
 )
-_checksum="$(curl -s "${_base_url}/${_base_src}.checksums" | grep ${_tarball} | grep sha512 | cut -d " " -f1)"
-sha512sums=("${_checksum}"
-            '725babc1365e02a30f50aafbc069b04a97cd247f76240b99b0a734dcce0e560f30cfd441efe9b0b9edcc48f327c8adad34e1ae45c2ba047205c84921d5e43e59'
-            '2df6b84978ec459ffad3e0d285c816da07a890db30284d3b2bec250472c10e08003edf705278cb97e02a52fb5f1325d962c08d5fbcf98f484e982a97e381407b'
-            'bae5a952d9b92e7a0ccc82f2caac3578e0368ea6676f0a4bc69d3ce276ef4f70802888f882dda53f9eb8e52911fb31e09ef497188bcd630762e1c0f5293cc010')
+source_i686=("${_url_l10n}/${_file_i686}")
+source_x86_64=("${_url_l10n}/${_file_x86_64}")
+sha512sums=(
+    '725babc1365e02a30f50aafbc069b04a97cd247f76240b99b0a734dcce0e560f30cfd441efe9b0b9edcc48f327c8adad34e1ae45c2ba047205c84921d5e43e59'
+    '2df6b84978ec459ffad3e0d285c816da07a890db30284d3b2bec250472c10e08003edf705278cb97e02a52fb5f1325d962c08d5fbcf98f484e982a97e381407b'
+    'bae5a952d9b92e7a0ccc82f2caac3578e0368ea6676f0a4bc69d3ce276ef4f70802888f882dda53f9eb8e52911fb31e09ef497188bcd630762e1c0f5293cc010'
+)
+_srcsum_i686="$(curl -s "${_url_l10n}/${_sums_i686}" | grep "${_file_i686}" | grep sha512 | cut -d " " -f1)"
+_srcsum_x86_64="$(curl -s "${_url_l10n}/${_sums_x86_64}" | grep "${_file_x86_64}" | grep sha512 | cut -d " " -f1)"
+sha512sums_i686=("${_srcsum_i686}")
+sha512sums_x86_64=("${_srcsum_x86_64}")
 
 pkgver() {
   SRC_VER="${_name}-${_version}.en-US.linux-${CARCH}.txt"
-  curl -OR "https://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/latest-mozilla-central/${SRC_VER}"
+  curl -OR "${_url}/${SRC_VER}"
   echo "${_version}.$(head -n1 ${SRC_VER} | cut -c -8)"
 }
 
 # Uncomment check() to enable GnuPG signature verification. You’ll need Mozilla’s GnuPG release key.
 # Their current fingerprint is 14F2 6682 D091 6CDD 81E3 7B6D 61B7 B526 D98F 0353
 #check() {
-#  CHECKSUM="${_base_src}.checksums"
+#  CHECKSUM="${_src}-${CARCH}.checksums"
 #  CHECKSIG="${CHECKSUM}.asc"
-#  curl -OR "${_base_url}/${CHECKSUM}"
-#  curl -OR "${_base_url}/${CHECKSIG}"
+#  curl -OR "${_url_l10n}/${CHECKSUM}"
+#  curl -OR "${_url_l10n}/${CHECKSIG}"
 #  gpg --verify ${CHECKSIG} ${CHECKSUM}
 #}