remade PKGBUILD & files thanks to yochananmarqos

5 files changed, 71 insertions, 81 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 254db4224a05..9ddefbccda11 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 pkgbase = mullvad-vpn-beta
-	pkgdesc = VPN Client for Mullvad.net (latest/beta release).
+	pkgdesc = The Mullvad VPN client app for desktop (latest/beta release)
 	pkgver = 2019.9.stable
-	pkgrel = 1
+	pkgrel = 2
 	url = https://www.mullvad.net
-	install = mullvad-vpn-beta.install
+	install = mullvad-vpn.install
 	arch = x86_64
 	license = GPL3
 	depends = gconf
@@ -14,13 +14,11 @@ pkgbase = mullvad-vpn-beta
 	depends = nss
 	provides = mullvad-vpn
 	conflicts = mullvad-vpn
-	replaces = mullvad-vpn-old
-	backup = etc/mullvad-vpn/settings.json
-	source = https://github.com/mullvad/mullvadvpn-app/releases/download/2019.9/MullvadVPN-2019.9_x86_64.rpm
-	source = https://github.com/mullvad/mullvadvpn-app/releases/download/2019.9/MullvadVPN-2019.9_x86_64.rpm.asc
+	source = https://github.com/mullvad/mullvadvpn-app/releases/download/2019.9/MullvadVPN-2019.9_amd64.deb
+	source = https://github.com/mullvad/mullvadvpn-app/releases/download/2019.9/MullvadVPN-2019.9_amd64.deb.asc
 	validpgpkeys = A1198702FC3E0A09A9AE5B75D5A1D4F266DE8DDF
-	md5sums = 046015c4657582c4b47392203f4ea08e
-	md5sums = SKIP
+	sha256sums = 4ba5b1c87cb5afdadbcfb37413bdd7ea72df139dd01815e9ca0f1c54f81f03e1
+	sha256sums = SKIP
 
 pkgname = mullvad-vpn-beta
 
diff --git a/.gitignore b/.gitignore
index 874856d629f2..1eda0cac5061 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,8 @@
-/*
+# Ignore everything
+*
+
+# But not these files...
 !.gitignore
-!.SRCINFO
 !PKGBUILD
-!mullvad-vpn-beta.install
+!.SRCINFO
+!mullvad-vpn.install
diff --git a/PKGBUILD b/PKGBUILD
index e9891808ebef..eba5fb3c7b40 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,52 +1,28 @@
 # Maintainer: telans <telans@protonmail.com>
-# Contributor: Matthew McGinn <mamcgi@gmail.com>
-# Contributor: alicewww <almw@protonmail.com>
+# Co-Maintainer: yochananmarqos <yochanan.marqos@gmail.com>
 
 pkgname=mullvad-vpn-beta
-_pkgname=mullvad-vpn
 pkgver=2019.9.stable
 _pkgver=2019.9
-pkgrel=1
-pkgdesc="VPN Client for Mullvad.net (latest/beta release)."
-_github_url="https://github.com/mullvad/mullvadvpn-app"
+pkgrel=2
+pkgdesc="The Mullvad VPN client app for desktop (latest/beta release)"
 url="https://www.mullvad.net"
 arch=('x86_64')
 license=('GPL3')
 depends=('gconf' 'gtk3' 'libnotify' 'libappindicator-gtk2' 'libxss' 'nss')
-conflicts=('mullvad-vpn')
-replaces=('mullvad-vpn-old')
-provides=($_pkgname)
-validpgpkeys=("A1198702FC3E0A09A9AE5B75D5A1D4F266DE8DDF")
-source=("https://github.com/mullvad/mullvadvpn-app/releases/download/${_pkgver}/MullvadVPN-${_pkgver}_${arch}.rpm"
-        "https://github.com/mullvad/mullvadvpn-app/releases/download/${_pkgver}/MullvadVPN-${_pkgver}_${arch}.rpm.asc")
-
-md5sums=('046015c4657582c4b47392203f4ea08e'
-         'SKIP')
-
-install=$pkgname.install
-backup=('etc/mullvad-vpn/settings.json')
+provides=("${pkgname%-beta}")
+conflicts=("${pkgname%-beta}")
+install="${pkgname%-beta}.install"
+source=("https://github.com/mullvad/mullvadvpn-app/releases/download/$_pkgver/MullvadVPN-${_pkgver}_amd64.deb"{,.asc})
+sha256sums=('4ba5b1c87cb5afdadbcfb37413bdd7ea72df139dd01815e9ca0f1c54f81f03e1'
+            'SKIP')
+validpgpkeys=('A1198702FC3E0A09A9AE5B75D5A1D4F266DE8DDF') # Mullvad (code signing) <admin@mullvad.net>
 
 package() {
-    # /opt/ Contents
-    install -d "${pkgdir}/opt/${_pkgname}"
-    cp -a "${srcdir}/opt/Mullvad VPN/." "${pkgdir}/opt/${_pkgname}"
-    chmod 755 "${pkgdir}/opt/${_pkgname}/${_pkgname}"
-    
-    # /usr/bin/ Contents
-    install -Dm755 "${srcdir}/usr/bin/mullvad" "${pkgdir}/usr/bin/mullvad"
-    ln -s "/opt/${_pkgname}/${_pkgname}" "${pkgdir}/usr/bin/${_pkgname}"
-
-    # Systemd Service
-    sed -i 's|Mullvad\\x20VPN|mullvad-vpn|g' "${pkgdir}/opt/${_pkgname}/resources/mullvad-daemon.service"
-    install -Dm644 "${pkgdir}/opt/${_pkgname}/resources/mullvad-daemon.service" \
-        "${pkgdir}/usr/lib/systemd/system/mullvad-daemon.service"
-
-    # Desktop Entry
-    sed -i 's|Mullvad VPN|mullvad-vpn|g' "${srcdir}/usr/share/applications/${_pkgname}.desktop"
-    install -Dm644 "${srcdir}/usr/share/applications/${_pkgname}.desktop" \
-        "${pkgdir}/usr/share/applications/${_pkgname}.desktop"
-
-    # Icons
-    install -dm755 "${pkgdir}/usr/share/icons/hicolor"
-    cp -a "${srcdir}/usr/share/icons/hicolor/." "${pkgdir}/usr/share/icons/hicolor"
+	tar -xvf data.tar.xz -C "$pkgdir"
+	
+	ln -s "/opt/Mullvad VPN/mullvad-gui" "$pkgdir/usr/bin/${pkgname%-beta}"
+	
+	install -Dm644 "$pkgdir/opt/Mullvad VPN/resources/mullvad-daemon.service" \
+		"$pkgdir/usr/lib/systemd/system/mullvad-daemon.service"
 }
diff --git a/mullvad-vpn-beta.install b/mullvad-vpn-beta.install
deleted file mode 100644
index 49a8146b3ad2..000000000000
--- a/mullvad-vpn-beta.install
+++ /dev/null
@@ -1,29 +0,0 @@
-post_install() {
-    systemctl enable --now mullvad-daemon
-
-    echo -------------------------------------------------------------
-    echo 'mullvad-daemon has been enabled & started.'
-    echo -------------------------------------------------------------
-}
-
-post_upgrade() {
-    systemctl daemon-reload
-    systemctl restart mullvad-daemon
-
-    echo -------------------------------------------------------------
-    echo 'mullvad-daemon has been restarted.'
-    echo -------------------------------------------------------------
-}
-
-pre_remove() {
-    systemctl disable --now mullvad-daemon
-}
-
-post_remove() {
-    # Remove logs & cache
-    rm -rf /var/log/mullvad-vpn/
-    rm -rf /var/cache/mullvad-vpn/
-
-    # Remove config. See backup()
-    #rm -rf /etc/mullvad-vpn
-}
\ No newline at end of file
diff --git a/mullvad-vpn.install b/mullvad-vpn.install
new file mode 100644
index 000000000000..6fe7d441bf1f
--- /dev/null
+++ b/mullvad-vpn.install
@@ -0,0 +1,42 @@
+pre_install() {
+	if systemctl status mullvad-daemon &> /dev/null; then
+		echo 'Stopping & disabling Mullvad VPN daemon...'
+		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
+}
+
+pre_upgrade() {
+	echo 'Stopping Mullvad VPN daemon...'
+	systemctl stop mullvad-daemon
+}
+
+post_upgrade() {
+	echo 'Restarting Mullvad VPN daemon...'
+	systemctl daemon-reload
+	systemctl start mullvad-daemon
+}
+
+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
+}
+
+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 -------------------------------------------------------------
+}