Fix pkgver and i686

2 files changed, 12 insertions, 10 deletions

diff --git a/.SRCINFO b/.SRCINFO
index cd9ed1dd5796..ee6dd80cd148 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = firefox-nightly
 	pkgdesc = Standalone Web Browser from Mozilla — Nightly build (en-US)
-	pkgver = 56.0a1.20170720
+	pkgver = 56.0a1.20170721
 	pkgrel = 1
 	url = https://www.mozilla.org/en-US/firefox/nightly
 	arch = i686
@@ -27,15 +27,15 @@ pkgbase = firefox-nightly
 	validpgpkeys = 14F26682D0916CDD81E37B6D61B7B526D98F0353
 	sha512sums = b514abafc559ec03a4222442fa4306db257c3de9e18ed91a0b37cc9d7058a8e08a241442e54a67659a3ab4512a5dae6a0b94ea7a33d08ef0b8a76a9eac902095
 	sha512sums = bae5a952d9b92e7a0ccc82f2caac3578e0368ea6676f0a4bc69d3ce276ef4f70802888f882dda53f9eb8e52911fb31e09ef497188bcd630762e1c0f5293cc010
-	source_i686 = https://ftp.mozilla.org/pub/firefox/nightly/latest-mozilla-central/firefox-56.0a1.en-US.linux-i686.tar.bz2
-	source_i686 = https://ftp.mozilla.org/pub/firefox/nightly/latest-mozilla-central/firefox-56.0a1.en-US.linux-i686.tar.bz2.asc
-	source_i686 = https://ftp.mozilla.org/pub/firefox/nightly/latest-mozilla-central/firefox-56.0a1.en-US.linux-i686.txt
+	source_i686 = 20170721-firefox-56.0a1.en-US.linux-i686.tar.bz2::https://ftp.mozilla.org/pub/firefox/nightly/latest-mozilla-central/firefox-56.0a1.en-US.linux-i686.tar.bz2
+	source_i686 = 20170721-firefox-56.0a1.en-US.linux-i686.tar.bz2.asc::https://ftp.mozilla.org/pub/firefox/nightly/latest-mozilla-central/firefox-56.0a1.en-US.linux-i686.tar.bz2.asc
+	source_i686 = 20170721-firefox-56.0a1.en-US.linux-i686.txt::https://ftp.mozilla.org/pub/firefox/nightly/latest-mozilla-central/firefox-56.0a1.en-US.linux-i686.txt
 	sha512sums_i686 = SKIP
 	sha512sums_i686 = SKIP
 	sha512sums_i686 = SKIP
-	source_x86_64 = 20170720-firefox-56.0a1.en-US.linux-x86_64.tar.bz2::https://ftp.mozilla.org/pub/firefox/nightly/latest-mozilla-central/firefox-56.0a1.en-US.linux-x86_64.tar.bz2
-	source_x86_64 = 20170720-firefox-56.0a1.en-US.linux-x86_64.tar.bz2.asc::https://ftp.mozilla.org/pub/firefox/nightly/latest-mozilla-central/firefox-56.0a1.en-US.linux-x86_64.tar.bz2.asc
-	source_x86_64 = https://ftp.mozilla.org/pub/firefox/nightly/latest-mozilla-central/firefox-56.0a1.en-US.linux-x86_64.txt
+	source_x86_64 = 20170721-firefox-56.0a1.en-US.linux-x86_64.tar.bz2::https://ftp.mozilla.org/pub/firefox/nightly/latest-mozilla-central/firefox-56.0a1.en-US.linux-x86_64.tar.bz2
+	source_x86_64 = 20170721-firefox-56.0a1.en-US.linux-x86_64.tar.bz2.asc::https://ftp.mozilla.org/pub/firefox/nightly/latest-mozilla-central/firefox-56.0a1.en-US.linux-x86_64.tar.bz2.asc
+	source_x86_64 = 20170721-firefox-56.0a1.en-US.linux-x86_64.txt::https://ftp.mozilla.org/pub/firefox/nightly/latest-mozilla-central/firefox-56.0a1.en-US.linux-x86_64.txt
 	sha512sums_x86_64 = SKIP
 	sha512sums_x86_64 = SKIP
 	sha512sums_x86_64 = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index 64a5ea7996f4..fa005a35d1c6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=${_name}-${_channel}
 pkgdesc="Standalone Web Browser from Mozilla — Nightly build (${_lang})"
 url="https://www.mozilla.org/${_lang}/${_name}/${_channel}"
 _version=56.0a1
-pkgver=56.0a1.20170720
+pkgver=56.0a1.20170721
 pkgrel=1
 arch=('i686' 'x86_64')
 license=('MPL' 'GPL' 'LGPL')
@@ -26,10 +26,12 @@ _url="https://ftp.mozilla.org/pub/${_name}/nightly/latest-mozilla-central"
 _src="${_name}-${_version}.${_lang}.linux"
 _filename="$(date +%Y%m%d)-${_src}"
 source=("${pkgname}.desktop" 'vendor.js')
-source_i686=("${_url}/${_src}-i686.tar.bz2"{,.asc} "${_url}/${_src}-i686.txt")
+source_i686=("${_filename}-i686.tar.bz2"::"${_url}/${_src}-i686.tar.bz2"
+             "${_filename}-i686.tar.bz2.asc"::"${_url}/${_src}-i686.tar.bz2.asc"
+             "${_filename}-i686.txt"::"${_url}/${_src}-i686.txt")
 source_x86_64=("${_filename}-x86_64.tar.bz2"::"${_url}/${_src}-x86_64.tar.bz2"
                "${_filename}-x86_64.tar.bz2.asc"::"${_url}/${_src}-x86_64.tar.bz2.asc"
-               "${_url}/${_src}-x86_64.txt")
+               "${_filename}-x86_64.txt"::"${_url}/${_src}-x86_64.txt")
 sha512sums=(
     'b514abafc559ec03a4222442fa4306db257c3de9e18ed91a0b37cc9d7058a8e08a241442e54a67659a3ab4512a5dae6a0b94ea7a33d08ef0b8a76a9eac902095'
     'bae5a952d9b92e7a0ccc82f2caac3578e0368ea6676f0a4bc69d3ce276ef4f70802888f882dda53f9eb8e52911fb31e09ef497188bcd630762e1c0f5293cc010'