Install directory

5 files changed, 23 insertions, 17 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ced10eed70b4..f3d9babd0d2f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -29,10 +29,11 @@ pkgbase = firefox-beta-bin
 	optdepends = gstreamer0.10-ffmpeg: more decoders
 	optdepends = libpulse: PulseAudio driver
 	optdepends = networkmanager: Location detection via available WiFi networks
+	provides = firefox=40.0
 	source = firefox-beta-bin.desktop
 	source = firefox-beta-bin-safe.desktop
-	md5sums = 13bd50c37f55a83539a680ce83162468
-	md5sums = a85c53ccb2b78514f37833d288a20ba2
+	md5sums = f7d82a1aac76f0bead4245fc1572eee1
+	md5sums = 6616cf32c69b50a126812334c8d65329
 	source_i686 = https://ftp.mozilla.org/pub/mozilla.org/firefox/releases/40.0/linux-i686/en-US/firefox-40.0.tar.bz2
 	md5sums_i686 = 4d3e29bba3d8b75c607247c378a583ac
 	source_x86_64 = https://ftp.mozilla.org/pub/mozilla.org/firefox/releases/40.0/linux-x86_64/en-US/firefox-40.0.tar.bz2
diff --git a/PKGBUILD b/PKGBUILD
index b0db9d1f8414..cb4301d7564b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,6 +2,7 @@
 # Contributors: Achilleas Pipinellis, speed145a, Schnouki
 
 pkgname=firefox-beta-bin
+_pkgname=firefox-beta
 pkgver=40.0
 _major=${pkgver/rc*}
 _build=${pkgver/*rc}
@@ -20,6 +21,7 @@ optdepends=('gstreamer0.10-base: vorbis decoding, ogg demuxing'
             'libpulse: PulseAudio driver'
             'networkmanager: Location detection via available WiFi networks')
 makedepends=('pacman>=4.2.0')
+provides=("firefox=$pkgver")
 install=$pkgname.install
 source=("$pkgname.desktop"
         "$pkgname-safe.desktop")
@@ -30,8 +32,8 @@ if [[ $_build = ? ]]; then
   source_i686=("https://ftp.mozilla.org/pub/mozilla.org/firefox/candidates/$_major-candidates/build$_build/linux-i686/en-US/firefox-$_major.tar.bz2")
   source_x86_64=("https://ftp.mozilla.org/pub/mozilla.org/firefox/candidates/$_major-candidates/build$_build/linux-x86_64/en-US/firefox-$_major.tar.bz2")
 fi
-md5sums=('13bd50c37f55a83539a680ce83162468'
-         'a85c53ccb2b78514f37833d288a20ba2')
+md5sums=('f7d82a1aac76f0bead4245fc1572eee1'
+         '6616cf32c69b50a126812334c8d65329')
 md5sums_i686=('4d3e29bba3d8b75c607247c378a583ac')
 md5sums_x86_64=('0cc7b398175a48144f3fd658a2ff052c')
 
@@ -45,10 +47,11 @@ package() {
 
   msg2 "Moving stuff in place..."
   # Install
-  cp -r firefox/ "$pkgdir"/opt/$pkgname-$pkgver
+  cp -r firefox/ "$pkgdir"/opt/$_pkgname
 
-  # /usr/bin link
-  ln -s /opt/$pkgname-$pkgver/firefox "$pkgdir"/usr/bin/$pkgname
+  # /usr/bin symlinks
+  ln -s /opt/$_pkgname/firefox "$pkgdir"/usr/bin/$_pkgname
+  ln -s /opt/$_pkgname/firefox "$pkgdir"/usr/bin/$pkgname  # compatibility
 
   # Desktops
   install -m644 *.desktop "$pkgdir"/usr/share/applications/
@@ -56,10 +59,11 @@ package() {
   # Icons
   for i in 16x16 22x22 24x24 32x32 48x48 256x256; do
     install -d "$pkgdir"/usr/share/icons/hicolor/$i/apps/
-    ln -s /opt/$pkgname-$pkgver/browser/chrome/icons/default/default${i/x*}.png \
-          "$pkgdir"/usr/share/icons/hicolor/$i/apps/$pkgname.png
+    ln -s /opt/$_pkgname/browser/chrome/icons/default/default${i/x*}.png \
+          "$pkgdir"/usr/share/icons/hicolor/$i/apps/$_pkgname.png
   done
 
-  ln -s /opt/$pkgname-$pkgver/browser/icons/mozicon128.png \
-        "$pkgdir"/usr/share/icons/hicolor/128x128/apps/$pkgname.png
+  # 128x128
+  ln -s /opt/$_pkgname/browser/icons/mozicon128.png \
+        "$pkgdir"/usr/share/icons/hicolor/128x128/apps/$_pkgname.png
 }
diff --git a/firefox-beta-bin-safe.desktop b/firefox-beta-bin-safe.desktop
index e53fadf2407c..f2bdfedff9f5 100644
--- a/firefox-beta-bin-safe.desktop
+++ b/firefox-beta-bin-safe.desktop
@@ -2,8 +2,8 @@
 Name=Firefox Beta - Safe Mode
 GenericName=Web Browser - Safe Mode
 Comment=Browse the World Wide Web in Safe Mode
-Exec=firefox-beta-bin -safe-mode %u
-Icon=firefox-beta-bin
+Exec=firefox-beta -safe-mode %u
+Icon=firefox-beta
 Terminal=false
 Type=Application
 MimeType=text/html;text/xml;application/xhtml+xml;application/vnd.mozilla.xul+xml;text/mml;x-scheme-handler/http;x-scheme-handler/https;
diff --git a/firefox-beta-bin.desktop b/firefox-beta-bin.desktop
index f6bff4dec8a3..34c51b8dbecc 100644
--- a/firefox-beta-bin.desktop
+++ b/firefox-beta-bin.desktop
@@ -2,8 +2,8 @@
 Name=Firefox Beta
 GenericName=Web Browser
 Comment=Browse the World Wide Web
-Exec=firefox-beta-bin %u
-Icon=firefox-beta-bin
+Exec=firefox-beta %u
+Icon=firefox-beta
 Terminal=false
 Type=Application
 MimeType=text/html;text/xml;application/xhtml+xml;application/vnd.mozilla.xul+xml;text/mml;x-scheme-handler/http;x-scheme-handler/https;
diff --git a/firefox-beta-bin.install b/firefox-beta-bin.install
index ab05bb2f045b..62330313ea0c 100644
--- a/firefox-beta-bin.install
+++ b/firefox-beta-bin.install
@@ -22,11 +22,12 @@ _update() {
 post_install() {
     _update
     note 1 "This package installs side-by-side with [extra]'s firefox."
-    note 2 "The binary is called 'firefox-beta-bin'."
+    note 2 "The binary is called 'firefox-beta'."
 }
 
 post_upgrade() {
-    _update
+    #_update
+	post_install
 }
 
 post_remove() {