2022.1-beta1

3 files changed, 16 insertions, 13 deletions

diff --git a/.SRCINFO b/.SRCINFO
index bb93b6df90a1..778ba7f83b66 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = mullvad-vpn-beta
 	pkgdesc = The Mullvad VPN client app for desktop (beta channel)
-	pkgver = 2021.6.stable
-	pkgrel = 2
+	pkgver = 2022.1.beta1
+	pkgrel = 1
 	url = https://www.mullvad.net
 	install = mullvad-vpn.install
 	arch = x86_64
@@ -17,8 +17,8 @@ pkgbase = mullvad-vpn-beta
 	provides = mullvad-vpn
 	conflicts = mullvad-vpn
 	options = !lto
-	source = git+https://github.com/mullvad/mullvadvpn-app.git#tag=2021.6?signed
-	source = git+https://github.com/mullvad/mullvadvpn-app-binaries.git#commit=19a97997b188855d0ba5aedb7419683df45d93bc?signed
+	source = git+https://github.com/mullvad/mullvadvpn-app.git#tag=2022.1-beta1?signed
+	source = git+https://github.com/mullvad/mullvadvpn-app-binaries.git#commit=973ee47bec89df537b8ecae20235071055693ec5
 	source = mullvad-vpn.sh
 	validpgpkeys = EA0A77BF9E115615FC3BD8BC7653B940E494FE87
 	validpgpkeys = 8339C7D2942EB854E3F27CE5AEE9DECFD582E984
diff --git a/PKGBUILD b/PKGBUILD
index 4363ed8e5aa3..f179749d6b64 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,14 +5,14 @@
 # Contributor: Emīls Piņķis <emil at mullvad dot net>
 # Contributor: Andrej Mihajlov <and at mullvad dot net>
 pkgname=mullvad-vpn-beta
-_pkgver=2021.6
-_channel=stable
+_pkgver=2022.1
+_channel=beta
 _rel=1
 # beta
-#pkgver=${_pkgver}.${_channel}${_rel}
+pkgver=${_pkgver}.${_channel}${_rel}
 # stable
-pkgver=${_pkgver}.${_channel}
-pkgrel=2
+#pkgver=${_pkgver}.${_channel}
+pkgrel=1
 pkgdesc="The Mullvad VPN client app for desktop (beta channel)"
 arch=('x86_64')
 url="https://www.mullvad.net"
@@ -23,11 +23,12 @@ provides=("${pkgname%-beta}")
 conflicts=("${pkgname%-beta}")
 options=('!lto')
 install="${pkgname%-beta}.install"
-_commit=19a97997b188855d0ba5aedb7419683df45d93bc
+_commit=973ee47bec89df537b8ecae20235071055693ec5
 source=(
-#        "git+https://github.com/mullvad/mullvadvpn-app.git#tag=${_pkgver}-${_channel}${_rel}?signed" # beta
-        "git+https://github.com/mullvad/mullvadvpn-app.git#tag=${_pkgver}?signed" # stable
-        "git+https://github.com/mullvad/mullvadvpn-app-binaries.git#commit=$_commit?signed"
+        "git+https://github.com/mullvad/mullvadvpn-app.git#tag=${_pkgver}-${_channel}${_rel}?signed" # beta
+#        "git+https://github.com/mullvad/mullvadvpn-app.git#tag=${_pkgver}?signed" # stable
+#        "git+https://github.com/mullvad/mullvadvpn-app-binaries.git#commit=$_commit?signed"
+        "git+https://github.com/mullvad/mullvadvpn-app-binaries.git#commit=$_commit" # unverified commit by mvd-ows
         "${pkgname%-beta}.sh"
        )
 sha256sums=('SKIP'
diff --git a/mullvad-vpn.install b/mullvad-vpn.install
index 4f347b86666b..0c044d13fbcd 100644
--- a/mullvad-vpn.install
+++ b/mullvad-vpn.install
@@ -38,6 +38,8 @@ pre_remove() {
   systemctl stop mullvad-daemon || true
   systemctl disable mullvad-daemon || 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"
 }