use install rather than mkdir. backup settings.json

2 files changed, 5 insertions, 4 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 975dcf2c94cd..7d9583d0fffa 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = mullvad-vpn-beta
 	pkgdesc = VPN Client for Mullvad.net (latest/beta release).
 	pkgver = 2019.7.stable
-	pkgrel = 1
+	pkgrel = 2
 	url = https://www.mullvad.net
 	install = mullvad-vpn-beta.install
 	arch = x86_64
@@ -15,6 +15,7 @@ pkgbase = mullvad-vpn-beta
 	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.7/MullvadVPN-2019.7_x86_64.rpm
 	source = https://github.com/mullvad/mullvadvpn-app/releases/download/2019.7/MullvadVPN-2019.7_x86_64.rpm.asc
 	validpgpkeys = A1198702FC3E0A09A9AE5B75D5A1D4F266DE8DDF
diff --git a/PKGBUILD b/PKGBUILD
index f9cb0bc0835b..0fd9fece3c18 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=mullvad-vpn-beta
 _pkgname=mullvad-vpn
 pkgver=2019.7.stable
 _pkgver=2019.7
-pkgrel=1
+pkgrel=2
 pkgdesc="VPN Client for Mullvad.net (latest/beta release)."
 _github_url="https://github.com/mullvad/mullvadvpn-app"
 url="https://www.mullvad.net"
@@ -24,6 +24,7 @@ md5sums=('3e3632b9b3d3769aebfba42c31d9e756'
          'SKIP')
 
 install=$pkgname.install
+backup=('etc/mullvad-vpn/settings.json')
 
 package() {
     # /opt/ Contents
@@ -32,9 +33,8 @@ package() {
     chmod 755 "${pkgdir}/opt/${_pkgname}/${_pkgname}"
     
     # /usr/bin/ Contents
-    mkdir -p ${pkgdir}/usr/bin
+    install -Dm755 "${srcdir}/usr/bin/mullvad" "${pkgdir}/usr/bin/mullvad"
     ln -s "/opt/${_pkgname}/${_pkgname}" "${pkgdir}/usr/bin/${_pkgname}"
-    install -m755 "${srcdir}/usr/bin/mullvad" "${pkgdir}/usr/bin/mullvad"
 
     # Systemd Service
     sed -i 's|Mullvad\\x20VPN|mullvad-vpn|g' "${pkgdir}/opt/${_pkgname}/resources/mullvad-daemon.service"