upgpkg: firefox-nightly-en-gb

Add support for triple digit versions. Woo!

2 files changed, 4 insertions, 6 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4ba1b3dabf1a..dcc407e7e079 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = firefox-nightly-en-gb
 	pkgdesc = Standalone Web Browser from Mozilla — Nightly build (en-GB)
-	pkgver = 86.0a1.20201214.230337
+	pkgver = 100.0a1.20220316.214937
 	pkgrel = 1
 	url = https://www.mozilla.org/en-GB/firefox/nightly
 	arch = x86_64
@@ -25,8 +25,8 @@ pkgbase = firefox-nightly-en-gb
 	conflicts = firefox-nightly
 	source = firefox-nightly.desktop
 	source = policies.json
-	source = 20201214-230337-firefox-86.0a1.en-GB.linux-x86_64.tar.bz2::https://ftp.mozilla.org/pub/firefox/nightly/2020/12/2020-12-14-23-03-37-mozilla-central-l10n/firefox-86.0a1.en-GB.linux-x86_64.tar.bz2
-	source = 20201214-230337-firefox-86.0a1.en-GB.linux-x86_64.tar.bz2.asc::https://ftp.mozilla.org/pub/firefox/nightly/2020/12/2020-12-14-23-03-37-mozilla-central-l10n/firefox-86.0a1.en-GB.linux-x86_64.tar.bz2.asc
+	source = 20220316-214937-firefox-100.0a1.en-GB.linux-x86_64.tar.bz2::https://ftp.mozilla.org/pub/firefox/nightly/2022/03/2022-03-16-21-49-37-mozilla-central-l10n/firefox-100.0a1.en-GB.linux-x86_64.tar.bz2
+	source = 20220316-214937-firefox-100.0a1.en-GB.linux-x86_64.tar.bz2.asc::https://ftp.mozilla.org/pub/firefox/nightly/2022/03/2022-03-16-21-49-37-mozilla-central-l10n/firefox-100.0a1.en-GB.linux-x86_64.tar.bz2.asc
 	validpgpkeys = 14F26682D0916CDD81E37B6D61B7B526D98F0353
 	sha512sums = b514abafc559ec03a4222442fa4306db257c3de9e18ed91a0b37cc9d7058a8e08a241442e54a67659a3ab4512a5dae6a0b94ea7a33d08ef0b8a76a9eac902095
 	sha512sums = 5ed67bde39175d4d10d50ba5b12063961e725e94948eadb354c0588b30d3f97d2178b66c1af466a6e7bd208ab694227a1391c4141f88d3da1a1178454eba5308
@@ -34,4 +34,3 @@ pkgbase = firefox-nightly-en-gb
 	sha512sums = SKIP
 
 pkgname = firefox-nightly-en-gb
-
diff --git a/PKGBUILD b/PKGBUILD
index fc3e7ab7ba72..4c41ef872e99 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -13,8 +13,7 @@ url="https://www.mozilla.org/${_lang}/${_name}/${_channel}"
 
 # Apparently there is an alternate URL - https://archive.mozilla.org/pub/
 _base_url="https://ftp.mozilla.org/pub/${_name}/${_channel}"
-_version=$(curl -s ${_base_url}/latest-mozilla-central-l10n/ | grep "${_lang}.linux-${CARCH}.checksums" | sort | tail -n 1 | sed "s/^.*>firefox-//; s/\.${_lang}.*//")
-
+_version=$(curl "${CURL_OPTS[@]}" ${_base_url}/latest-mozilla-central-l10n/ | grep "${_lang}.linux-${CARCH}.checksums" | sed "s/^.*>firefox-//; s/\.${_lang}.*//" | sort -n | tail -n 1)
 _build_id_raw="$(curl -s "${_base_url}/latest-mozilla-central-l10n/${_name}-${_version}.${_lang}.linux-${CARCH}.checksums" | grep '.partial.mar' | cut -d' ' -f4 | grep -E -o '[[:digit:]]{14}' | sort | tail -n1)"
 declare -A _build_id
 _build_id=(