Add wrapper launcher script to ensure WM_CLASS is always set

4 files changed, 24 insertions, 8 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6b433a330918..2f43c749b4c3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Tue Sep 12 12:14:42 UTC 2017
+# Tue Sep 12 13:29:22 UTC 2017
 pkgbase = firefox-beta-bin-all-localizations
 	pkgdesc = Perl script for installing latest FF beta in the language of your choice
 	pkgver = 56.0b11
-	pkgrel = 1
+	pkgrel = 2
 	url = https://www.mozilla.com/firefox/channel/#beta
 	arch = i686
 	arch = x86_64
@@ -24,8 +24,10 @@ pkgbase = firefox-beta-bin-all-localizations
 	provides = firefox=56.0b11
 	source = firefox-beta-bin.desktop
 	source = ff-downloader.pl
-	md5sums = e2cbab614d6b4a75e8ac3a34c8676931
+	source = firefox-beta.sh
+	md5sums = 4c0ca11a8034b53c0c5b7b9830442cd7
 	md5sums = b4d5afd97c8ac229f6027d7853c73c0c
+	md5sums = ea377d9d48f6abe4d9b1554122fcff83
 
 pkgname = firefox-beta-bin-all-localizations
 
diff --git a/PKGBUILD b/PKGBUILD
index c3b99a65a451..54784229e644 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -16,7 +16,7 @@ optdepends=('networkmanager: Location detection via available WiFi networks'
             'pulseaudio: Audio support')
 makedepends=('perl-file-slurp' 'perl-lwp-protocol-https' 'perl-switch')
 provides=("firefox=$pkgver")
-source=('firefox-beta-bin.desktop' 'ff-downloader.pl')
+source=('firefox-beta-bin.desktop' 'ff-downloader.pl' 'firefox-beta.sh')
 
 build() {
   perl ff-downloader.pl -v $pkgver
@@ -27,10 +27,11 @@ package() {
   mkdir -p $pkgdir/usr/{lib,bin,share/{applications,pixmaps}}
 
   cp -r firefox "${pkgdir}/usr/lib/${_mypkgn}"
-  ln -s /usr/lib/${_mypkgn}/firefox ${pkgdir}/usr/bin/firefox-beta
+  install -m755 ${srcdir}/firefox-beta.sh ${pkgdir}/usr/bin/firefox-beta
 
   install -m644 firefox-beta-bin.desktop ${pkgdir}/usr/share/applications/
   install -m644 ${srcdir}/firefox/browser/icons/mozicon128.png ${pkgdir}/usr/share/pixmaps/${_mypkgn}.png
 }
-md5sums=('e2cbab614d6b4a75e8ac3a34c8676931'
-         'b4d5afd97c8ac229f6027d7853c73c0c')
+md5sums=('4c0ca11a8034b53c0c5b7b9830442cd7'
+         'b4d5afd97c8ac229f6027d7853c73c0c'
+         'ea377d9d48f6abe4d9b1554122fcff83')
diff --git a/firefox-beta-bin.desktop b/firefox-beta-bin.desktop
index 7e43c588e470..806651c23b1f 100644
--- a/firefox-beta-bin.desktop
+++ b/firefox-beta-bin.desktop
@@ -1,7 +1,8 @@
 [Desktop Entry]
 Version=1.0
 Name=Firefox Beta
-Exec=/usr/bin/firefox-beta --class "Firefox Beta" %u
+Exec=/usr/bin/firefox-beta %u
+# WM_CLASS is set from our firefox-beta wrapper script
 StartupWMClass=Firefox Beta
 Icon=firefox-beta
 Terminal=false
diff --git a/firefox-beta.sh b/firefox-beta.sh
new file mode 100755
index 000000000000..9997b9356a83
--- /dev/null
+++ b/firefox-beta.sh
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+# Check if --class is already set
+for arg in "${@}"; do
+    if [ "$arg" == '--class' ]; then
+        exec /usr/lib/firefox-beta/firefox "$@"
+        break;
+    fi
+done
+
+# Set default --class
+exec /usr/lib/firefox-beta/firefox --class 'Firefox Beta' "$@"