updated to 2020.5

3 files changed, 17 insertions, 13 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 3038388eac2f..1fb0d16d9eec 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = mullvad-vpn-bin
 	pkgdesc = The Mullvad VPN client app for desktop
-	pkgver = 2020.4
-	pkgrel = 2
+	pkgver = 2020.5
+	pkgrel = 1
 	url = https://www.mullvad.net
 	install = mullvad-vpn.install
 	arch = x86_64
@@ -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/2020.4/MullvadVPN-2020.4_amd64.deb
-	source = https://github.com/mullvad/mullvadvpn-app/releases/download/2020.4/MullvadVPN-2020.4_amd64.deb.asc
+	source = https://github.com/mullvad/mullvadvpn-app/releases/download/2020.5/MullvadVPN-2020.5_amd64.deb
+	source = https://github.com/mullvad/mullvadvpn-app/releases/download/2020.5/MullvadVPN-2020.5_amd64.deb.asc
 	source = mullvad-vpn.sh
 	validpgpkeys = A1198702FC3E0A09A9AE5B75D5A1D4F266DE8DDF
-	sha256sums = 997f83a11f91f2be715ed55f02b15057c99ffa1a23df234123712734c543b19f
+	sha256sums = 760b1482e20d4064e3da20575950783d7ce10e092e386154b1ac737929363f8c
 	sha256sums = SKIP
 	sha256sums = a59c29f07b4eab9af56f0e8be42bae0d83726f5185e88de0c5a48f4098c3c0a4
 
diff --git a/PKGBUILD b/PKGBUILD
index 4177809d8c5d..83b5e08dec38 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,8 +2,8 @@
 # Contributor: Matthew McGinn <mamcgi at gmail dot com>
 # Contributor: alicewww <almw at protonmail dot com>
 pkgname=mullvad-vpn-bin
-pkgver=2020.4
-pkgrel=2
+pkgver=2020.5
+pkgrel=1
 pkgdesc="The Mullvad VPN client app for desktop"
 url="https://www.mullvad.net"
 arch=('x86_64')
@@ -14,7 +14,7 @@ conflicts=("${pkgname%-bin}")
 install="${pkgname%-bin}.install"
 source=("https://github.com/mullvad/mullvadvpn-app/releases/download/$pkgver/MullvadVPN-${pkgver}_amd64.deb"{,.asc}
         "${pkgname%-bin}.sh")
-sha256sums=('997f83a11f91f2be715ed55f02b15057c99ffa1a23df234123712734c543b19f'
+sha256sums=('760b1482e20d4064e3da20575950783d7ce10e092e386154b1ac737929363f8c'
             'SKIP'
             'a59c29f07b4eab9af56f0e8be42bae0d83726f5185e88de0c5a48f4098c3c0a4')
 validpgpkeys=('A1198702FC3E0A09A9AE5B75D5A1D4F266DE8DDF') # Mullvad (code signing) <admin at mullvad dot net>
diff --git a/mullvad-vpn.install b/mullvad-vpn.install
index 6fe7d441bf1f..95ec59694b77 100644
--- a/mullvad-vpn.install
+++ b/mullvad-vpn.install
@@ -1,26 +1,30 @@
 pre_install() {
 	if systemctl status mullvad-daemon &> /dev/null; then
 		echo 'Stopping & disabling Mullvad VPN daemon...'
+		/opt/Mullvad\ VPN/resources/mullvad-setup prepare-restart || true
 		systemctl disable --now mullvad-daemon
 	fi
-	
+
 	rm -f /var/cache/mullvad-vpn/relays.json || true
 }
 
 post_install() {
 	echo 'Enabling Mullvad VPN daemon...'
 	systemctl enable --now mullvad-daemon
+
+	chmod u+s "/usr/bin/mullvad-exclude"
 }
 
 pre_upgrade() {
-	echo 'Stopping Mullvad VPN daemon...'
-	systemctl stop mullvad-daemon
+	pre_install
 }
 
 post_upgrade() {
-	echo 'Restarting Mullvad VPN daemon...'
+	echo 'Starting & enabling Mullvad VPN daemon...'
 	systemctl daemon-reload
-	systemctl start mullvad-daemon
+	systemctl enable --now mullvad-daemon
+
+	chmod u+s "/usr/bin/mullvad-exclude"
 }
 
 pre_remove() {