2022.1

3 files changed, 21 insertions, 11 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7660326c1897..5023551cf5bd 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = mullvad-vpn-bin
 	pkgdesc = The Mullvad VPN client app for desktop
-	pkgver = 2021.6
+	pkgver = 2022.1
 	pkgrel = 1
 	url = https://www.mullvad.net
 	install = mullvad-vpn.install
@@ -12,11 +12,11 @@ pkgbase = mullvad-vpn-bin
 	depends = nss
 	provides = mullvad-vpn
 	conflicts = mullvad-vpn
-	source = https://github.com/mullvad/mullvadvpn-app/releases/download/2021.6/MullvadVPN-2021.6_amd64.deb
-	source = https://github.com/mullvad/mullvadvpn-app/releases/download/2021.6/MullvadVPN-2021.6_amd64.deb.asc
+	source = https://github.com/mullvad/mullvadvpn-app/releases/download/2022.1/MullvadVPN-2022.1_amd64.deb
+	source = https://github.com/mullvad/mullvadvpn-app/releases/download/2022.1/MullvadVPN-2022.1_amd64.deb.asc
 	source = mullvad-vpn.sh
 	validpgpkeys = A1198702FC3E0A09A9AE5B75D5A1D4F266DE8DDF
-	sha256sums = 95b9638f304a00d72ce6b6f3a38ff9f623142541cfaa4d6e9aa142c27d86ea6e
+	sha256sums = 713043f60a146f5a8669abd4c05e3fde8e5b7658d4b9cd269ea9cc7264f22268
 	sha256sums = SKIP
 	sha256sums = a59c29f07b4eab9af56f0e8be42bae0d83726f5185e88de0c5a48f4098c3c0a4
 
diff --git a/PKGBUILD b/PKGBUILD
index 6036d5eda074..6f9a288a8cba 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 # Contributor: Matthew McGinn <mamcgi at gmail dot com>
 # Contributor: alicewww <almw at protonmail dot com>
 pkgname=mullvad-vpn-bin
-pkgver=2021.6
+pkgver=2022.1
 pkgrel=1
 pkgdesc="The Mullvad VPN client app for desktop"
 arch=('x86_64')
@@ -14,7 +14,7 @@ conflicts=("${pkgname%-*}")
 install="${pkgname%-*}.install"
 source=("https://github.com/mullvad/mullvadvpn-app/releases/download/$pkgver/MullvadVPN-${pkgver}_amd64.deb"{,.asc}
         "${pkgname%-*}.sh")
-sha256sums=('95b9638f304a00d72ce6b6f3a38ff9f623142541cfaa4d6e9aa142c27d86ea6e'
+sha256sums=('713043f60a146f5a8669abd4c05e3fde8e5b7658d4b9cd269ea9cc7264f22268'
             'SKIP'
             'a59c29f07b4eab9af56f0e8be42bae0d83726f5185e88de0c5a48f4098c3c0a4')
 validpgpkeys=('A1198702FC3E0A09A9AE5B75D5A1D4F266DE8DDF') # Mullvad (code signing) <admin@mullvad.net>
diff --git a/mullvad-vpn.install b/mullvad-vpn.install
index cfea2e5a484d..dac3acb40a31 100644
--- a/mullvad-vpn.install
+++ b/mullvad-vpn.install
@@ -3,11 +3,14 @@ pre_install() {
     echo 'Stopping & disabling Mullvad VPN daemon...'
     /opt/Mullvad\ VPN/resources/mullvad-setup prepare-restart || true
     systemctl disable --now mullvad-daemon
+    cp /var/log/mullvad-vpn/daemon.log /var/log/mullvad-vpn/old-install-daemon.log \
+      || echo "Failed to copy old daemon log"
   fi
 
   pkill -x "mullvad-gui" || true
 
-  rm -f /var/cache/mullvad-vpn/relays.json || true
+  rm -f /var/cache/mullvad-vpn/relays.json
+  rm -f /var/cache/mullvad-vpn/api-ip-address.txt
 }
 
 post_install() {
@@ -30,14 +33,15 @@ post_upgrade() {
 }
 
 pre_remove() {
-  /usr/bin/mullvad account clear-history || echo "Failed to remove leftover WireGuard keys"
-
   # the user might've disabled or stopped the service themselves already
   echo 'Making sure the Mullvad VPN daemon is stopped & disabled...'
   systemctl stop mullvad-daemon || true
   systemctl disable mullvad-daemon || true
 
-  /opt/Mullvad\ VPN/resources/mullvad-setup reset-firewall || true
+  pkill -x "mullvad-gui" || true
+
+  /opt/Mullvad\ VPN/resources/mullvad-setup reset-firewall || echo "Failed to reset firewall"
+  /opt/Mullvad\ VPN/resources/mullvad-setup clear-history || echo "Failed to remove leftover WireGuard keys"
 }
 
 post_remove() {
@@ -47,6 +51,12 @@ post_remove() {
   echo 'sudo rm -rf /var/cache/mullvad-vpn/'
   echo ''
   echo 'Optionally remove config:'
-  echo 'sudo rm -rf /etc/mullvad-vpn'
+  echo 'sudo rm -rf /etc/mullvad-vpn/'
+  echo ''
+  echo 'Optionally remove app settings:'
+  echo 'rm -rf ~/.config/Mullvad VPN/'
+  echo ''
+  echo 'Optionally remove auto-launcher:'
+  echo 'rm ~/.config/autostart/mullvad-vpn.desktop'
   echo -------------------------------------------------------------
 }