Updated to 58.0a1

2 files changed, 12 insertions, 6 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 48e0e841d0f7..5252c3c67329 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = firefox-nightly-ru
 	pkgdesc = Web browser from mozilla.org, nightly build, russian version
-	pkgver = 57.0a1
+	pkgver = 58.0a1.20170930
 	pkgrel = 1
 	url = http://nightly.mozilla.org/
 	install = firefox-nightly-ru.install
@@ -23,11 +23,11 @@ pkgbase = firefox-nightly-ru
 	source = firefox-nightly.desktop
 	source = firefox-nightly-ru.install
 	source = vendor.js
-	source = https://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/latest-mozilla-central-l10n/firefox-57.0a1.ru.linux-x86_64.tar.bz2
+	source = 20170930-firefox-58.0a1.ru.linux-x86_64.tar.bz2::https://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/latest-mozilla-central-l10n/firefox-58.0a1.ru.linux-x86_64.tar.bz2
 	sha512sums = 5c825fab6b7bd279d372cfb5dad35293d212c89b73dcfb9b0e83f166159567d8ba3fc642b35fda57b20a0f2e8cc346b83ee1d469920d973096257d718ec3beb7
 	sha512sums = bc940986f5acb02706714d5dcbc32e17b167190dc9a30c7d63bf5317a45a1a0ff9da5ea302b9c8efc32acf7b75d2dec1420f542cb0ba08c3e3d59273d18baa96
 	sha512sums = bae5a952d9b92e7a0ccc82f2caac3578e0368ea6676f0a4bc69d3ce276ef4f70802888f882dda53f9eb8e52911fb31e09ef497188bcd630762e1c0f5293cc010
-	sha512sums = 413761e0472e6976853f9621fddf4f4036e52e8b7a4c5d882575d5786531d2bd670beb397a320dc93d7848072b6e9716f416d2fee3c24e998333fb6fbeb1bfce
+	sha512sums = a1bbd5a4474b06364e50f1057aabcb923be1afea7533882c39945be3be5d8a887487383949627aa0bf67f1f65dcdcc2288e5f253cacfd9554fe308d3a0b82886
 
 pkgname = firefox-nightly-ru
 
diff --git a/PKGBUILD b/PKGBUILD
index b3b441593d61..02cea8483b84 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,17 +4,19 @@
 pkgname=firefox-nightly-ru
 pkgdesc='Web browser from mozilla.org, nightly build, russian version'
 url='http://nightly.mozilla.org/'
-pkgver=57.0a1
+_version=58.0a1
+pkgver=58.0a1.20170930
 pkgrel=1
 arch=('i686' 'x86_64')
 license=('MPL' 'GPL' 'LGPL')
-_filename="firefox-${pkgver}.ru.linux-${CARCH}"
+_filename="firefox-${_version}.ru.linux-${CARCH}"
 _baseurl="https://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/latest-mozilla-central-l10n"
 _sha512sum="$(curl -vs "${_baseurl}/${_filename}.checksums" 2>&1 | grep bz | grep sha512 | cut -d " " -f1 | head -n 1)"
+_date="$(curl -sL https://ftp.mozilla.org/pub/firefox/nightly/latest-mozilla-central-l10n/ | grep -A2 "firefox-57.0a1.ru.linux-x86_64.tar.bz2\"" | tail -n1 | cut -f2 -d'>' | cut -f1 -d' ' | date +%Y%m%d)"
 source=('firefox-nightly.desktop'
         'firefox-nightly-ru.install'
         'vendor.js'
-        "${_baseurl}/${_filename}.tar.bz2")
+        "${_date}-${_filename}.tar.bz2::${_baseurl}/${_filename}.tar.bz2")
 sha512sums=('5c825fab6b7bd279d372cfb5dad35293d212c89b73dcfb9b0e83f166159567d8ba3fc642b35fda57b20a0f2e8cc346b83ee1d469920d973096257d718ec3beb7'
          'bc940986f5acb02706714d5dcbc32e17b167190dc9a30c7d63bf5317a45a1a0ff9da5ea302b9c8efc32acf7b75d2dec1420f542cb0ba08c3e3d59273d18baa96'
          'bae5a952d9b92e7a0ccc82f2caac3578e0368ea6676f0a4bc69d3ce276ef4f70802888f882dda53f9eb8e52911fb31e09ef497188bcd630762e1c0f5293cc010'
@@ -24,6 +26,10 @@ depends=('alsa-lib' 'libxt' 'libnotify' 'mime-types' 'nss' 'gtk2' 'gtk3'
 'sqlite' 'dbus-glib' 'desktop-file-utils')
 conflicts=('firefox-nightly')
 
+pkgver() {
+  echo "${_version}.${_date}"
+}
+
 package() {
   mkdir -p "${pkgdir}"/{usr/{bin,share/{applications,pixmaps}},opt}
   cp -r firefox "${pkgdir}/opt/firefox-nightly-ru"