+ Now downloading from CDN

+ Added 'jq' opt. dependency for updater script
+ System dictionaries support
+ Update desktop DB after install/update (.install file)

3 files changed, 30 insertions, 8 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 10c93f34633d..d8dce5d4ac6f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,9 @@
 pkgbase = firefox-nightly-ru
-	pkgdesc = Web browser from mozilla.org, nightly build, russian version
+	pkgdesc = Standalone Web Browser from Mozilla — Nightly build (ru)
 	pkgver = 67.0a1.20190201093730
 	pkgrel = 1
 	url = http://nightly.mozilla.org/
+	install = firefox-nightly-ru.install
 	arch = i686
 	arch = x86_64
 	license = MPL
@@ -21,18 +22,19 @@ pkgbase = firefox-nightly-ru
 	optdepends = networkmanager: location detection via available WiFi networks
 	optdepends = speech-dispatcher: text-to-speech
 	optdepends = startup-notification: support for FreeDesktop Startup Notification
+	optdepends = jq: updater script support
 	conflicts = firefox-nightly
 	source = firefox-nightly.desktop
 	source = policies.json
 	validpgpkeys = 14F26682D0916CDD81E37B6D61B7B526D98F0353
 	sha512sums = 02bd8c8c717e6796fb1772f51c1bfd78ff3ca7c5355c08b9568dc36cb72b8b84330d20522653eedda12bdec1517cd4074a4bc5d51a8667880121e946b85c11ec
 	sha512sums = 5ed67bde39175d4d10d50ba5b12063961e725e94948eadb354c0588b30d3f97d2178b66c1af466a6e7bd208ab694227a1391c4141f88d3da1a1178454eba5308
-	source_i686 = 20190201-firefox-67.0a1.ru.linux.tar.bz2::https://ftp.mozilla.org/pub/firefox/nightly/latest-mozilla-central-l10n/firefox-67.0a1.ru.linux-i686.tar.bz2
-	source_i686 = 20190201-firefox-67.0a1.ru.linux.tar.bz2.asc::https://ftp.mozilla.org/pub/firefox/nightly/latest-mozilla-central-l10n/firefox-67.0a1.ru.linux-i686.tar.bz2.asc
+	source_i686 = 20190201-firefox-67.0a1.ru.linux.tar.bz2::https://download-installer.cdn.mozilla.net/pub/firefox/nightly/latest-mozilla-central-l10n/firefox-67.0a1.ru.linux-i686.tar.bz2
+	source_i686 = 20190201-firefox-67.0a1.ru.linux.tar.bz2.asc::https://download-installer.cdn.mozilla.net/pub/firefox/nightly/latest-mozilla-central-l10n/firefox-67.0a1.ru.linux-i686.tar.bz2.asc
 	sha512sums_i686 = SKIP
 	sha512sums_i686 = SKIP
-	source_x86_64 = 20190201-firefox-67.0a1.ru.linux.tar.bz2::https://ftp.mozilla.org/pub/firefox/nightly/latest-mozilla-central-l10n/firefox-67.0a1.ru.linux-x86_64.tar.bz2
-	source_x86_64 = 20190201-firefox-67.0a1.ru.linux.tar.bz2.asc::https://ftp.mozilla.org/pub/firefox/nightly/latest-mozilla-central-l10n/firefox-67.0a1.ru.linux-x86_64.tar.bz2.asc
+	source_x86_64 = 20190201-firefox-67.0a1.ru.linux.tar.bz2::https://download-installer.cdn.mozilla.net/pub/firefox/nightly/latest-mozilla-central-l10n/firefox-67.0a1.ru.linux-x86_64.tar.bz2
+	source_x86_64 = 20190201-firefox-67.0a1.ru.linux.tar.bz2.asc::https://download-installer.cdn.mozilla.net/pub/firefox/nightly/latest-mozilla-central-l10n/firefox-67.0a1.ru.linux-x86_64.tar.bz2.asc
 	sha512sums_x86_64 = SKIP
 	sha512sums_x86_64 = SKIP
 
diff --git a/PKGBUILD b/PKGBUILD
index 4a80603bf920..5e0674401636 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,13 +3,13 @@
 # Contributor: Denis Vadimov <me @ bloody.pw>
 
 _version=67.0a1
-_baseurl="https://ftp.mozilla.org/pub/firefox/nightly/latest-mozilla-central-l10n/"
+_baseurl="https://download-installer.cdn.mozilla.net/pub/firefox/nightly/latest-mozilla-central-l10n/"
 _date="$(date +%Y%m%d)"
 _filename="firefox-${_version}.ru.linux"
 pkgname=firefox-nightly-ru
 pkgver=67.0a1.20190201093730
 pkgrel=1
-pkgdesc='Web browser from mozilla.org, nightly build, russian version'
+pkgdesc='Standalone Web Browser from Mozilla — Nightly build (ru)'
 arch=('i686' 'x86_64')
 url='http://nightly.mozilla.org/'
 license=('MPL' 'GPL' 'LGPL')
@@ -21,8 +21,10 @@ optdepends=('pulseaudio: audio support'
             'libnotify: notification integration'
             'networkmanager: location detection via available WiFi networks'
             'speech-dispatcher: text-to-speech'
-            'startup-notification: support for FreeDesktop Startup Notification')
+            'startup-notification: support for FreeDesktop Startup Notification'
+            'jq: updater script support')
 conflicts=('firefox-nightly')
+install=${pkgname}.install
 source=('firefox-nightly.desktop'
         'policies.json')
 source_i686=("${_date}-${_filename}.tar.bz2::${_baseurl}${_filename}-i686.tar.bz2"
@@ -45,7 +47,18 @@ package() {
   cp -r firefox "${pkgdir}/opt/firefox-nightly-ru"
   mkdir -p "${pkgdir}/opt/firefox-nightly-ru/distribution/"
   ln -s /opt/firefox-nightly-ru/firefox "${pkgdir}/usr/bin/firefox-nightly"
+
+  # Install .desktop
   install -m644 "${srcdir}/firefox-nightly.desktop" "${pkgdir}/usr/share/applications/"
+
+  # Install icons
   install -m644 "${srcdir}/firefox/browser/chrome/icons/default/default128.png" "${pkgdir}/usr/share/pixmaps/firefox-nightly-icon.png"
+
+  # Disable auto updates
   install -Dm644 "${srcdir}/policies.json" "${pkgdir}/opt/firefox-nightly-ru/distribution"
+
+  # Use system-provided dictionaries
+  rm -rf "${pkgdir}/opt/firefox-nightly-ru/{dictionaries,hyphenation}"
+  ln -sf /usr/share/hunspell "${pkgdir}"/opt/firefox-nightly-ru/dictionaries
+  ln -sf /usr/share/hyphen "${pkgdir}"/opt/firefox-nightly-ru/hyphenation
 }
diff --git a/firefox-nightly-ru.install b/firefox-nightly-ru.install
new file mode 100644
index 000000000000..68424653977c
--- /dev/null
+++ b/firefox-nightly-ru.install
@@ -0,0 +1,7 @@
+post_install() {
+   update-desktop-database -q
+}
+
+post_upgrade() {
+   update-desktop-database -q
+}