update pkg (thanks emils@mullvad.net)

Signed-off-by: Matthew McGinn <mamcgi@gmail.com>

4 files changed, 13 insertions, 39 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a6f14da7d7e4..0bc869e0b97c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = mullvad-vpn
 	pkgdesc = VPN Client for Mullvad.net, a bitcoin-friendly VPN for anonymity and privacy
 	pkgver = 2019.8
-	pkgrel = 1
+	pkgrel = 2
 	url = https://www.mullvad.net
 	arch = x86_64
 	license = GPL3
@@ -14,13 +14,9 @@ pkgbase = mullvad-vpn
 	provides = mullvad-vpn
 	conflicts = mullvad-vpn-old
 	replaces = mullvad-vpn-old
-	source = mullvad-daemon.service
-	source = mullvad-vpn.desktop
 	source = https://github.com/mullvad/mullvadvpn-app/releases/download/2019.8/MullvadVPN-2019.8_x86_64.rpm
 	source = https://github.com/mullvad/mullvadvpn-app/releases/download/2019.8/MullvadVPN-2019.8_x86_64.rpm.asc
 	validpgpkeys = A1198702FC3E0A09A9AE5B75D5A1D4F266DE8DDF
-	md5sums = ed3a49275addbd5f2098a33bd605f1d3
-	md5sums = 9628b4f93e72f5cca0a47087ae10b0fd
 	md5sums = e1c7ad82a8cfe126bb0175d820752086
 	md5sums = SKIP
 
diff --git a/PKGBUILD b/PKGBUILD
index c235bdec3d2f..a38404f68ed7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=mullvad-vpn
 pkgver=2019.8
-pkgrel=1
+pkgrel=2
 pkgdesc="VPN Client for Mullvad.net, a bitcoin-friendly VPN for anonymity and privacy"
 _github_url="https://github.com/mullvad/mullvadvpn-app"
 url="https://www.mullvad.net"
@@ -16,35 +16,35 @@ provides=($pkgname)
 backup=()
 install=
 validpgpkeys=("A1198702FC3E0A09A9AE5B75D5A1D4F266DE8DDF")
-source=(mullvad-daemon.service
-mullvad-vpn.desktop
-"https://github.com/mullvad/mullvadvpn-app/releases/download/${pkgver}/MullvadVPN-${pkgver}_${arch}.rpm"
+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=('ed3a49275addbd5f2098a33bd605f1d3'
-         '9628b4f93e72f5cca0a47087ae10b0fd'
-         'e1c7ad82a8cfe126bb0175d820752086'
+md5sums=('e1c7ad82a8cfe126bb0175d820752086'
          'SKIP')
 
 package() {
     # Install systemd service
-    install -Dm644 mullvad-daemon.service "${pkgdir}/usr/lib/systemd/system/mullvad-daemon.service"
+    sed -i 's/Mullvad\\x20VPN/mullvad-vpn/g' "opt/Mullvad VPN/resources/mullvad-daemon.service"
+    install -Dm644 "opt/Mullvad VPN/resources/mullvad-daemon.service" \
+        "${pkgdir}/usr/lib/systemd/system/mullvad-daemon.service"
 
     # Install the main files.
     install -d "${pkgdir}/opt/${pkgname}"
     cp -a "${srcdir}/opt/Mullvad VPN/." "${pkgdir}/opt/${pkgname}"
 
     # Make it exec
-    chmod 755 "${pkgdir}/opt/${pkgname}/${pkgname}"
+    chmod 755 "${pkgdir}/opt/${pkgname}/mullvad-gui"
 
     # Main binary
     mkdir -p ${pkgdir}/usr/bin
-    ln -s "/opt/${pkgname}/${pkgname}" "${pkgdir}/usr/bin/${pkgname}"
+    ln -s "/opt/${pkgname}/mullvad-gui" "${pkgdir}/usr/bin/${pkgname}"
 
     # Desktop Entry
     install -d "${pkgdir}/usr/share/applications"
-    install ${pkgname}.desktop "${pkgdir}/usr/share/applications"
-    sed -i s%/usr/share%/opt% ${pkgdir}/usr/share/applications/${pkgname}.desktop
+    sed -i 's/Exec=.*/Exec=\/usr\/bin\/mullvad-vpn/g' \
+        "usr/share/applications/${pkgname}.desktop"
+    install -Dm644 "usr/share/applications/${pkgname}.desktop" \
+        "$pkgdir/usr/share/applications/${pkgname}.desktop"
 
     # CLI binary
     install -m755 "${srcdir}/usr/bin/mullvad" "${pkgdir}/usr/bin/mullvad"
diff --git a/mullvad-daemon.service b/mullvad-daemon.service
deleted file mode 100644
index 4831b98add19..000000000000
--- a/mullvad-daemon.service
+++ /dev/null
@@ -1,14 +0,0 @@
-[Unit]
-Description=Mullvad VPN daemon
-Wants=network.target
-After=network-online.target
-StartLimitBurst=5
-StartLimitIntervalSec=20
-
-[Service]
-Restart=always
-RestartSec=1
-ExecStart="/opt/mullvad-vpn/resources/mullvad-daemon" -v --disable-stdout-timestamps
-
-[Install]
-WantedBy=multi-user.target
diff --git a/mullvad-vpn.desktop b/mullvad-vpn.desktop
deleted file mode 100644
index 89fdff6dc9b6..000000000000
--- a/mullvad-vpn.desktop
+++ /dev/null
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Name=Mullvad VPN
-Comment=Mullvad VPN client
-Exec="/opt/mullvad-vpn/mullvad-vpn" %U
-Terminal=false
-Type=Application
-Icon=mullvad-vpn
-Categories=Network;