Mullvad - install browser from mullvad repository

mullvad/browser.sls

@@ -1,57 +0,0 @@
-delete_old_mullvad_browser_version:
-  file.absent:
-    - name: '/etc/skel/mullvad-browser'
-
-{% for archive in salt['file.find']('/etc/skel/Downloads/', name='mullvad_browser*') %}
-{{ archive }}_remove:
-  file.absent:
-    - name: {{ archive }}
-{% endfor %}
-
-/etc/skel/Downloads/mullvad_browser-linux-x86_64-13.0.16.tar.xz:
-  file.managed:
-    - source:
-      - salt://mullvad/mullvad-browser-linux-x86_64-13.0.16.tar.xz
-    - user: root
-    - group: root
-    - makedirs: True
-
-mullvad-browser-linux-x86_64-13.0.16.tar.xz:
-  archive.extracted:
-    - name: /etc/skel
-    - source: /etc/skel/Downloads/mullvad_browser-linux-x86_64-13.0.16.tar.xz
-    - user: user
-
-/etc/skel/.local/share/applications/start-mullvad-browser.desktop:
-  file.managed:
-    - source: salt://mullvad/start-mullvad-browser.desktop
-    - makedirs: True
-    - user: user
-
-/etc/skel/.local/share/applications/mimeinfo.cache:
-  file.managed:
-    - source: salt://mullvad/mimeinfo.cache
-    - makedirs: True
-    - user: user
-
-/home/user/.local/share/applications/start-mullvad-browser.desktop:
-  file.managed:
-    - source: salt://mullvad/start-mullvad-browser.desktop
-    - makedirs: True
-    - user: user
-
-/home/user/.local/share/applications/mimeinfo.cache:
-  file.managed:
-    - source: salt://mullvad/mimeinfo.cache
-    - makedirs: True
-    - user: user
-
-browser_dependencies:
-  pkg.installed:
-    - skip_suggestions: True
-    - install_recommends: False
-    - pkgs:
-      - libdbus-glib-1-2
-      - libnss3
-      - desktop-file-utils
-      - kdialog

mullvad/browser.top

@@ -1,3 +0,0 @@
-base:
- template-mullvad :
-    - mullvad.browser

mullvad/browser_client.sls

@@ -1,23 +0,0 @@
-{% for archive in salt['file.find']('/home/user/Downloads/', name='mullvad_browser*') %}
-{{ archive }}_remove:
-  file.absent:
-    - name: {{ archive }}
-{% endfor %}
-
-/home/user/Downloads/mullvad_browser-linux-x86_64-13.0.16.tar.xz:
-  file.managed:
-    - source:
-      - salt://mullvad/mullvad-browser-linux-x86_64-13.0.16.tar.xz
-    - user: root
-    - group: root
-    - makedirs: True
-
-remove_mullvad_browser:
-  file.absent:
-    - name: /home/user/mullvad-browser
-
-mullvad-browser-linux-x86_64-13.0.16.tar.xz:
-  archive.extracted:
-    - name: /home/user
-    - source: /home/user/Downloads/mullvad_browser-linux-x86_64-13.0.16.tar.xz
-    - user: user

mullvad/clone.sls

@@ -11,5 +11,5 @@ mullvad_menu:
   qvm.features:
     - name: template-mullvad
     - set:
-      - menu-items: "mullvad-vpn.desktop start-mullvad-browser.desktop debian-xterm.desktop"
-      - default-menu-items: "mullvad-vpn.desktop start-mullvad-browser.desktop debian-xterm.desktop"
+      - menu-items: "mullvad-vpn.desktop mullvad-browser.desktop debian-xterm.desktop"
+      - default-menu-items: "mullvad-vpn.desktop mullvad-browser.desktop debian-xterm.desktop"

mullvad/create.sls

@@ -24,4 +24,4 @@ qvm-features-id:
       - service.cups-browsed
       - service.tinyproxy
     - set:
-      - menu-items: "start-mullvad-browser.desktop mullvad-vpn.desktop debian-xterm.desktop"
+      - menu-items: "mullvad-vpn.desktop mullvad-browser.desktop debian-xterm.desktop"

mullvad/create_disposable.sls

@@ -25,7 +25,7 @@ mullvad-features_dvm:
       - service.cups-browsed
       - service.tinyproxy
     - set:
-      - menu-items: "mullvad-vpn.desktop start-mullvad-browser.desktop debian-xterm.desktop"
+      - menu-items: "mullvad-browser.desktop debian-xterm.desktop mullvad-vpn.desktop"
       - appmenus-dispvm: True
 
 'qvm-appmenus --update mullvad-dvm':

mullvad/mullvad-browser.desktop

@@ -0,0 +1,10 @@
+[Desktop Entry]
+Type=Application
+Name=Mullvad Browser
+GenericName=Web Browser
+Comment=Mullvad Browser is a privacy-focused web browser designed to minimize tracking and fingerprinting.
+Categories=Network;WebBrowser;Security;
+Exec=/usr/lib/mullvad-browser/start-mullvad-browser
+X-MullvadBrowser-ExecShell=/usr/lib/mullvad-browser/start-mullvad-browser
+Icon=mullvad-browser
+StartupWMClass=Mullvad Browser

mullvad/mullvad-vpn.desktop

@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=Mullvad VPN
+Exec="/opt/Mullvad VPN/mullvad-vpn" %U
+Terminal=false
+Type=Application
+Icon=mullvad-vpn
+StartupWMClass=Mullvad VPN
+Comment=Mullvad VPN client
+Categories=Network;

mullvad/repo.sls

@@ -70,6 +70,22 @@ mullvad_installed:
     - refresh: True
     - pkgs:
       - mullvad-vpn
+      - mullvad-browser
+      - libnss3
+
+/etc/skel/.local/share/applications/mullvad-browser.desktop:
+  file.managed:
+    - source: salt://mullvad/mullvad-browser.desktop
+    - user: root
+    - group: root
+    - makedirs: True
+
+/etc/skel/.local/share/applications/mullvad-vpn.desktop:
+  file.managed:
+    - source: salt://mullvad/mullvad-vpn.desktop
+    - user: root
+    - group: root
+    - makedirs: True
     
 {% endif %}
 {% endif %}

mullvad/start-mullvad-browser.desktop

@@ -1,34 +0,0 @@
-#!/usr/bin/env ./Browser/execdesktop
-#
-# This file is a self-modifying .desktop file that can be run from the shell.
-# It preserves arguments and environment for the start-mullvad-browser script.
-#
-# Run './start-mullvad-browser.desktop --help' to display the full set of options.
-#
-# When invoked from the shell, this file must always be in a Mullvad Browser root
-# directory. When run from the file manager or desktop GUI, it is relocatable.
-#
-# After first invocation, it will update itself with the absolute path to the
-# current Mullvad Browser location, to support relocation of this .desktop file for GUI
-# invocation. You can also add Mullvad Browser to your desktop's application menu
-# by running './start-mullvad-browser.desktop --register-app'
-#
-# If you use --register-app, and then relocate your Mullvad Browser directory, Mullvad Browser
-# will no longer launch from your desktop's app launcher/dock. However, if you
-# re-run --register-app from inside that new directory, the script
-# will correct the absolute paths and re-register itself.
-#
-# This file will also still function if the path changes when Mullvad Browser is used as a
-# portable app, so long as it is run directly from that new directory, either
-# via the shell or via the file manager.
-
-[Desktop Entry]
-Type=Application
-Name=Mullvad Browser
-GenericName=Web Browser
-Comment=Mullvad Browser  is +1 for privacy and −1 for mass surveillance
-Categories=Network;WebBrowser;Security;
-Exec=sh -c '"/home/user/mullvad-browser/Browser/start-mullvad-browser" || ([ !  -x "/home/user/mullvad-browser/Browser/start-mullvad-browser" ] && "$(dirname "$*")"/Browser/start-mullvad-browser --detach)' dummy %k
-X-MullvadBrowser-ExecShell=./Browser/start-mullvad-browser
-Icon=/home/user/mullvad-browser/Browser/browser/chrome/icons/default/default128.png
-StartupWMClass=Mullvad Browser