Enable automatic updates

5 files changed, 38 insertions, 13 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1becae7def24..eda378d5e9df 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 pkgbase = firefox-always-nightly
 pkgname = firefox-always-nightly
 pkgdesc = Standalone web browser from mozilla.org, nightly build, always updating
-pkgver = 99.0a1
-pkgrel = 20
+pkgver = 999.0a1
+pkgrel = 21
 url = https://blog.nightly.mozilla.org/
 arch = i686
 arch = x86_64
@@ -16,14 +16,13 @@ depends = mime-types
 depends = nss
 provides = firefox-nightly
 conflicts = firefox-nightly
+install = firefox-always-nightly.install
 source = https://ftp.mozilla.org/pub/firefox/nightly/latest-mozilla-central/firefox-VERSION.en-US.linux-ARCH.tar.bz2
 source = http://design.firefox.com/product-identity/firefox-nightly/firefox-logo-nightly.svg
 source = firefox-nightly.desktop
 source = firefox-nightly-safe.desktop
-source = vendor.js
 sha512sums = 
 sha512sums = f07445bbb6c97a803062b498c81063414ba83660d746ba5abd712d9c8e8e1469df9a015163ad8548298604630e1bfe586d78fb64f9966506770a2c45ae5be323
 sha512sums = e83bc6604c21d0f53845fb87abc4fd3a50c4375747d1c770322edf5bee6e7f21c46f1fd98269b44889f0c5fa69ac572302c6f184ce11b3ea371ce1ac3c469b39
 sha512sums = d5395d3d6afb812ac3dd3b1526d724ffbe0cd761594fc461ae353b071b09c4e4ac9357ab8a6487073fe52e295511acf0039585fc64961de21dee944027d523dd
-sha512sums = bae5a952d9b92e7a0ccc82f2caac3578e0368ea6676f0a4bc69d3ce276ef4f70802888f882dda53f9eb8e52911fb31e09ef497188bcd630762e1c0f5293cc010
 
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..f657f7f31879
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,7 @@
+*
+!.gitignore
+!PKGBUILD
+!.SRCINFO
+!firefox-always-nightly.install
+!firefox-nightly.desktop
+!firefox-nightly-safe.desktop
diff --git a/PKGBUILD b/PKGBUILD
index 23638334c06b..efcc65b3495e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -9,8 +9,8 @@
 pkgname=firefox-always-nightly
 pkgdesc='Standalone web browser from mozilla.org, nightly build, always updating'
 url='https://blog.nightly.mozilla.org/'
-pkgver=99.0a1
-pkgrel=20
+pkgver=999.0a1
+pkgrel=21
 arch=('i686' 'x86_64')
 license=('MPL' 'GPL' 'LGPL')
 _srcurl="https://ftp.mozilla.org/pub/firefox/nightly/latest-mozilla-central"
@@ -23,16 +23,15 @@ pkgver() {
   echo "${_version}.${_revision}"
 }
 
+install="${pkgname}.install"
 source=("${pkgname}-$(pkgver).tar.bz2::${_srcurl}/${_file}.tar.bz2"
         'http://design.firefox.com/product-identity/firefox-nightly/firefox-logo-nightly.svg'
         'firefox-nightly.desktop'
-        'firefox-nightly-safe.desktop'
-        'vendor.js')
+        'firefox-nightly-safe.desktop')
 sha512sums=("${_shasum}"
             'f07445bbb6c97a803062b498c81063414ba83660d746ba5abd712d9c8e8e1469df9a015163ad8548298604630e1bfe586d78fb64f9966506770a2c45ae5be323'
             'e83bc6604c21d0f53845fb87abc4fd3a50c4375747d1c770322edf5bee6e7f21c46f1fd98269b44889f0c5fa69ac572302c6f184ce11b3ea371ce1ac3c469b39'
-            'd5395d3d6afb812ac3dd3b1526d724ffbe0cd761594fc461ae353b071b09c4e4ac9357ab8a6487073fe52e295511acf0039585fc64961de21dee944027d523dd'
-            'bae5a952d9b92e7a0ccc82f2caac3578e0368ea6676f0a4bc69d3ce276ef4f70802888f882dda53f9eb8e52911fb31e09ef497188bcd630762e1c0f5293cc010')
+            'd5395d3d6afb812ac3dd3b1526d724ffbe0cd761594fc461ae353b071b09c4e4ac9357ab8a6487073fe52e295511acf0039585fc64961de21dee944027d523dd')
 
 depends=('dbus-glib' 'gtk3' 'libxt' 'mime-types' 'nss')
 optdepends=('pulseaudio: audio support'
@@ -51,11 +50,11 @@ conflicts=('firefox-nightly')
 package() {
   install -d "${pkgdir}"/{usr/{bin,share/{applications,pixmaps}},opt}
   cp -r firefox "${pkgdir}/opt/firefox-nightly"
+  chmod -R g+w "${pkgdir}/opt/firefox-nightly"
 
   ln -s /opt/firefox-nightly/firefox "${pkgdir}/usr/bin/firefox-nightly"
   install -Dm644 "${srcdir}"/{firefox-nightly.desktop,firefox-nightly-safe.desktop} "${pkgdir}/usr/share/applications/"
   install -Dm644 "${srcdir}/firefox-logo-nightly.svg" "${pkgdir}/usr/share/icons/hicolor/scalable/apps/firefox-nightly.svg"
   install -Dm644 "${srcdir}/firefox/browser/chrome/icons/default/default128.png" "${pkgdir}/usr/share/pixmaps/firefox-nightly.png"
   install -Dm644 "${srcdir}/firefox/browser/chrome/icons/default/default128.png" "${pkgdir}/usr/share/icons/hicolor/128x128/apps/firefox-nightly.png"
-  install -Dm644 "${srcdir}/vendor.js" "${pkgdir}/opt/firefox-nightly/browser/defaults/preferences/vendor.js"
 }
diff --git a/firefox-always-nightly.install b/firefox-always-nightly.install
new file mode 100755
index 000000000000..9059501b9017
--- /dev/null
+++ b/firefox-always-nightly.install
@@ -0,0 +1,22 @@
+post_install() {
+  getent group munin >/dev/null || groupadd --system munin
+  chown -R :firefox "/opt/firefox-nightly"
+  chmod -R g+w "/opt/firefox-nightly"
+
+  echo "==> Firefox Nightly automatic updates
+
+  Add yourself to the \`firefox\` group to enable automatic updates (faster,
+  smaller download size, with built-in integrity checking).
+
+  Only do this if you are the only user of your machine, as Firefox will write
+  updated files in the global install location as the user and group running
+  Firefox... so it could cause problems for other users.
+
+  It is safe to update this package with pacman after automatic updates.
+  To disable, set \`app.update.enable\` to \`false\` in about:config."
+
+}
+
+post_upgrade() {
+  post_install
+}
diff --git a/vendor.js b/vendor.js
deleted file mode 100644
index caa38c691d4d..000000000000
--- a/vendor.js
+++ /dev/null
@@ -1,2 +0,0 @@
-// Disable update check
-pref("app.update.enabled", false);