Add CLI wrapper; minor touchups

5 files changed, 29 insertions, 8 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 00dcfee50154..612a45345f1f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = mullvad-browser-bin
 	pkgdesc = Privacy-focused web browser developed in a collaboration between Mullvad VPN and the Tor Project.
 	pkgver = 12.0.4
-	pkgrel = 2
+	pkgrel = 3
 	url = https://mullvad.net/en/browser
 	arch = x86_64
 	license = GPL
@@ -25,8 +25,10 @@ pkgbase = mullvad-browser-bin
 	provides = mullvad-browser
 	conflicts = mullvad-browser
 	options = !strip
+	source = mullvad-browser.sh
 	source = mullvad-browser.desktop
-	sha256sums = 82de45a644102a8e4c63b74e8b6d99ec553d9ceb526ef1514fe65b6bc72d61f1
+	sha256sums = 7be1e26a22d71c795a53a93492358861169bac32cd9a4499aed00dff75007110
+	sha256sums = 7d6036df369a79bd54625f621479eff5c02a93ad749da3315f0e5ce14ba1f241
 	source_x86_64 = mullvad-browser-bin-12.0.4-x86_64.tar.xz::https://cdn.mullvad.net/browser/12.0.4/mullvad-browser-linux64-12.0.4_ALL.tar.xz
 	sha256sums_x86_64 = ab875328d42472a691c22176e6254e412bf054b037b494654380f30b7b6e1b90
 
diff --git a/.gitignore b/.gitignore
index 5321fe9a5f02..937ac4c52f60 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,4 +3,5 @@
 !.gitignore
 !PKGBUILD
 !mullvad-browser.desktop
+!mullvad-browser.sh
 
diff --git a/PKGBUILD b/PKGBUILD
index 106582f8ab35..663b25642547 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 pkgname=mullvad-browser-bin
 _pkgbase="${pkgname%-bin}"
 pkgver=12.0.4
-pkgrel=2
+pkgrel=3
 pkgdesc='Privacy-focused web browser developed in a collaboration between Mullvad VPN and the Tor Project.'
 arch=(x86_64)
 url=https://mullvad.net/en/browser
@@ -20,10 +20,11 @@ provides=("$_pkgbase=$pkgver" 'mullvad-browser')
 conflicts=("$_pkgbase")
 options=(!strip)
 
-source=(mullvad-browser.desktop)
+source=($_pkgbase.sh mullvad-browser.desktop)
 source_x86_64=(${pkgname}-${pkgver}-x86_64.tar.xz::https://cdn.mullvad.net/browser/$pkgver/mullvad-browser-linux64-${pkgver}_ALL.tar.xz)
 
-sha256sums=('82de45a644102a8e4c63b74e8b6d99ec553d9ceb526ef1514fe65b6bc72d61f1')
+sha256sums=('7be1e26a22d71c795a53a93492358861169bac32cd9a4499aed00dff75007110'
+            '7d6036df369a79bd54625f621479eff5c02a93ad749da3315f0e5ce14ba1f241')
 sha256sums_x86_64=('ab875328d42472a691c22176e6254e412bf054b037b494654380f30b7b6e1b90')
 
 package() {
@@ -37,10 +38,15 @@ package() {
   # ask it to create profiles in ~
   touch "$pkgdir/opt/$pkgname/Browser/system-install"
 
-  install -Dm0644 -t "$pkgdir/usr/share/applications/" mullvad-browser.desktop
+  # cli wrapper
+  install -Dm0755 $_pkgbase.sh "$pkgdir/usr/bin/$_pkgbase"
 
+  # desktop file for various launchers
+  install -Dm0644 -t "$pkgdir/usr/share/applications/" $_pkgbase.desktop
+
+  # icons
   for size in 16x16 32x32 48x48 64x64 128x128; do
     install -Dm0644 "$pkgdir/opt/$pkgname/Browser/browser/chrome/icons/default/default${size/x*/}.png" \
-      "$pkgdir/usr/share/icons/hicolor/$size/apps/mullvad-desktop.png"
+      "$pkgdir/usr/share/icons/hicolor/$size/apps/mullvad-browser.png"
   done
 }
diff --git a/mullvad-browser.desktop b/mullvad-browser.desktop
index ac86ab61e961..6c04ad58e29a 100644
--- a/mullvad-browser.desktop
+++ b/mullvad-browser.desktop
@@ -4,7 +4,7 @@ Name=Mullvad Browser
 GenericName=Web Browser
 Comment=Mullvad Browser is +1 for privacy and −1 for mass surveillance
 Categories=Network;WebBrowser;Security;
-Exec=/opt/mullvad-browser-bin/Browser/mullvadbrowser %U
+Exec=mullvad-browser %U
 Icon=web-browser
 StartupWMClass=Mullvad Browser
 
diff --git a/mullvad-browser.sh b/mullvad-browser.sh
new file mode 100755
index 000000000000..108631a12021
--- /dev/null
+++ b/mullvad-browser.sh
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+XDG_CONFIG_HOME="${XDG_CONFIG_HOME:-$HOME/.config}"
+
+# Allow users to override command-line options
+USER_FLAGS_FILE="$XDG_CONFIG_HOME/mullvad-browser-flags.conf"
+
+if [ -f "$USER_FLAGS_FILE" ]; then
+  USER_FLAGS="$(cat "$USER_FLAGS_FILE" | sed 's/#.*//')"
+fi
+
+exec /opt/mullvad-browser-bin/Browser/mullvadbrowser "$@" $USER_FLAGS