2021.5-beta1

3 files changed, 58 insertions, 54 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 3db49766baac..4f3552c0436c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = mullvad-vpn-beta-bin
 	pkgdesc = The Mullvad VPN client app for desktop (beta channel)
-	pkgver = 2021.4.stable
+	pkgver = 2021.5.beta1
 	pkgrel = 1
 	url = https://www.mullvad.net
 	install = mullvad-vpn.install
@@ -12,11 +12,11 @@ pkgbase = mullvad-vpn-beta-bin
 	depends = nss
 	provides = mullvad-vpn
 	conflicts = mullvad-vpn
-	source = https://github.com/mullvad/mullvadvpn-app/releases/download/2021.4/MullvadVPN-2021.4_amd64.deb
-	source = https://github.com/mullvad/mullvadvpn-app/releases/download/2021.4/MullvadVPN-2021.4_amd64.deb.asc
+	source = https://github.com/mullvad/mullvadvpn-app/releases/download/2021.5-beta1/MullvadVPN-2021.5-beta1_amd64.deb
+	source = https://github.com/mullvad/mullvadvpn-app/releases/download/2021.5-beta1/MullvadVPN-2021.5-beta1_amd64.deb.asc
 	source = mullvad-vpn.sh
 	validpgpkeys = A1198702FC3E0A09A9AE5B75D5A1D4F266DE8DDF
-	sha256sums = 2671c6e2a0fa9c7da5ed10981e66fb52cce7d26accb05b4c1d0ddc2a95dcab4d
+	sha256sums = ae6e6e1dbfb4ad82c7aa42c5098af472f2e98d9ebbf94c066cb2332ac9c1182d
 	sha256sums = SKIP
 	sha256sums = a59c29f07b4eab9af56f0e8be42bae0d83726f5185e88de0c5a48f4098c3c0a4
 
diff --git a/PKGBUILD b/PKGBUILD
index 4da44ebc6199..42e1d2c07351 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,12 @@
 # Maintainer: Mark Wagie <mark dot wagie at tutanota dot com>
 pkgname=mullvad-vpn-beta-bin
-_pkgver=2021.4
-_channel=stable
-pkgver=${_pkgver}.${_channel}
+_pkgver=2021.5
+_channel=beta
+_rel=1
+# beta
+pkgver=${_pkgver}.${_channel}${_rel}
+# stable
+#pkgver=${_pkgver}.${_channel}
 pkgrel=1
 pkgdesc="The Mullvad VPN client app for desktop (beta channel)"
 url="https://www.mullvad.net"
@@ -13,27 +17,27 @@ provides=("${pkgname%-*-*}")
 conflicts=("${pkgname%-*-*}")
 install="${pkgname%-*-*}.install"
 source=(
-#        "https://github.com/mullvad/mullvadvpn-app/releases/download/${_pkgver}-${_channel}1/MullvadVPN-${_pkgver}-${_channel}1_amd64.deb"{,.asc} # beta
-        "https://github.com/mullvad/mullvadvpn-app/releases/download/${_pkgver}/MullvadVPN-${_pkgver}_amd64.deb"{,.asc} # stable
+        "https://github.com/mullvad/mullvadvpn-app/releases/download/${_pkgver}-${_channel}1/MullvadVPN-${_pkgver}-${_channel}${_rel}_amd64.deb"{,.asc} # beta
+#        "https://github.com/mullvad/mullvadvpn-app/releases/download/${_pkgver}/MullvadVPN-${_pkgver}_amd64.deb"{,.asc} # stable
         "${pkgname%-*-*}.sh"
        )
-sha256sums=('2671c6e2a0fa9c7da5ed10981e66fb52cce7d26accb05b4c1d0ddc2a95dcab4d'
+sha256sums=('ae6e6e1dbfb4ad82c7aa42c5098af472f2e98d9ebbf94c066cb2332ac9c1182d'
             'SKIP'
             'a59c29f07b4eab9af56f0e8be42bae0d83726f5185e88de0c5a48f4098c3c0a4')
 validpgpkeys=('A1198702FC3E0A09A9AE5B75D5A1D4F266DE8DDF') # Mullvad (code signing) <admin@mullvad.net>
 
 package() {
-	bsdtar -xvf data.tar.xz -C "$pkgdir"
+  bsdtar -xvf data.tar.xz -C "$pkgdir"
 
-	# Link to the GUI binary
-	install -m755 "$srcdir/${pkgname%-*-*}.sh" "$pkgdir/usr/bin/${pkgname%-*-*}"
+  # Link to the GUI binary
+  install -m755 "$srcdir/${pkgname%-*-*}.sh" "$pkgdir/usr/bin/${pkgname%-*-*}"
 
-	# Symlink daemon service to correct directory
-	install -d "$pkgdir/usr/lib/systemd/system"
-	ln -s "/opt/Mullvad VPN/resources/mullvad-daemon.service" \
-		"$pkgdir/usr/lib/systemd/system"
+  # Symlink daemon service to correct directory
+  install -d "$pkgdir/usr/lib/systemd/system"
+  ln -s "/opt/Mullvad VPN/resources/mullvad-daemon.service" \
+    "$pkgdir/usr/lib/systemd/system"
 
-	# Move ZSH completions to correct directory
-	mv "$pkgdir/usr/local/share/zsh" "$pkgdir/usr/share"
-	rm -rf "$pkgdir/usr/local"
+  # Move ZSH completions to correct directory
+  mv "$pkgdir/usr/local/share/zsh" "$pkgdir/usr/share"
+  rm -rf "$pkgdir/usr/local"
 }
diff --git a/mullvad-vpn.install b/mullvad-vpn.install
index 83aa74c47467..4f347b86666b 100644
--- a/mullvad-vpn.install
+++ b/mullvad-vpn.install
@@ -1,54 +1,54 @@
 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
-		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
-	rm -f /var/cache/mullvad-vpn/api-ip-address.txt
+  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
+    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
+  rm -f /var/cache/mullvad-vpn/api-ip-address.txt
 }
 
 post_install() {
-	chmod u+s "/usr/bin/mullvad-exclude"
+  chmod u+s "/usr/bin/mullvad-exclude"
 
-	echo 'Enabling Mullvad VPN daemon...'
-	systemctl enable --now mullvad-daemon
+  echo 'Enabling Mullvad VPN daemon...'
+  systemctl enable --now mullvad-daemon
 }
 
 pre_upgrade() {
-	pre_install
+  pre_install
 }
 
 post_upgrade() {
-	echo 'Starting & enabling Mullvad VPN daemon...'
-	systemctl daemon-reload
-	systemctl enable --now mullvad-daemon
+  echo 'Starting & enabling Mullvad VPN daemon...'
+  systemctl daemon-reload
+  systemctl enable --now mullvad-daemon
 
-	chmod u+s "/usr/bin/mullvad-exclude"
+  chmod u+s "/usr/bin/mullvad-exclude"
 }
 
 pre_remove() {
-	# 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
+  # 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 || echo "Failed to reset firewall"
-	/opt/Mullvad\ VPN/resources/mullvad-setup clear-history || echo "Failed to remove leftover WireGuard keys"
+  /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() {
-	echo -------------------------------------------------------------
-	echo 'Optionally remove logs & cache:'
-	echo 'sudo rm -rf /var/log/mullvad-vpn/'
-	echo 'sudo rm -rf /var/cache/mullvad-vpn/'
-	echo ''
-	echo 'Optionally remove config:'
-	echo 'sudo rm -rf /etc/mullvad-vpn'
-	echo -------------------------------------------------------------
+  echo -------------------------------------------------------------
+  echo 'Optionally remove logs & cache:'
+  echo 'sudo rm -rf /var/log/mullvad-vpn/'
+  echo 'sudo rm -rf /var/cache/mullvad-vpn/'
+  echo ''
+  echo 'Optionally remove config:'
+  echo 'sudo rm -rf /etc/mullvad-vpn'
+  echo -------------------------------------------------------------
 }