use built-in .desktop & .service. fix conflicts

4 files changed, 19 insertions, 46 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 62becba73c40..04a732ba8904 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = mullvad-vpn-beta
 	pkgdesc = VPN Client for Mullvad.net, a bitcoin-friendly VPN for anonymity and privacy
 	pkgver = 2019.7.beta1
-	pkgrel = 1
+	pkgrel = 2
 	url = https://www.mullvad.net
 	install = mullvad-vpn-beta.install
 	arch = x86_64
@@ -13,17 +13,11 @@ pkgbase = mullvad-vpn-beta
 	depends = libxss
 	depends = nss
 	provides = mullvad-vpn
-	conflicts = mullvad-vpn-old
 	conflicts = mullvad-vpn
 	replaces = mullvad-vpn-old
-	replaces = mullvad-vpn
-	source = mullvad-daemon.service
-	source = mullvad-vpn.desktop
 	source = https://github.com/mullvad/mullvadvpn-app/releases/download/2019.7-beta1/MullvadVPN-2019.7-beta1_x86_64.rpm
 	source = https://github.com/mullvad/mullvadvpn-app/releases/download/2019.7-beta1/MullvadVPN-2019.7-beta1_x86_64.rpm.asc
 	validpgpkeys = A1198702FC3E0A09A9AE5B75D5A1D4F266DE8DDF
-	md5sums = ed3a49275addbd5f2098a33bd605f1d3
-	md5sums = 9628b4f93e72f5cca0a47087ae10b0fd
 	md5sums = 8525f785caa496c20c097440e40ed16b
 	md5sums = SKIP
 
diff --git a/PKGBUILD b/PKGBUILD
index 5192ac4a7c28..d650422c0b19 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,46 +6,47 @@ pkgname=mullvad-vpn-beta
 _pkgname=mullvad-vpn
 pkgver=2019.7.beta1
 _pkgver=2019.7-beta1
-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"
 arch=('x86_64')
 license=('GPL3')
 depends=('gconf' 'gtk3' 'libnotify' 'libappindicator-gtk2' 'libxss' 'nss')
-conflicts=('mullvad-vpn-old' 'mullvad-vpn')
-replaces=('mullvad-vpn-old' 'mullvad-vpn')
+conflicts=('mullvad-vpn')
+replaces=('mullvad-vpn-old')
 provides=($_pkgname)
 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'
-         '8525f785caa496c20c097440e40ed16b'
+md5sums=('8525f785caa496c20c097440e40ed16b'
          'SKIP')
 
 install=$pkgname.install
 
 package() {
-    install -Dm644 mullvad-daemon.service "${pkgdir}/usr/lib/systemd/system/mullvad-daemon.service"
-
+    # /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
     mkdir -p ${pkgdir}/usr/bin
     ln -s "/opt/${_pkgname}/${_pkgname}" "${pkgdir}/usr/bin/${_pkgname}"
+    install -m755 "${srcdir}/usr/bin/mullvad" "${pkgdir}/usr/bin/mullvad"
 
-    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
+    # 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"
 
-    install -m755 "${srcdir}/usr/bin/mullvad" "${pkgdir}/usr/bin/mullvad"
+    # 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"
 }
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;