Move systemd stuff out of pre-deinstall

mullvad-vpn-daemon/APKBUILD

@@ -30,6 +30,7 @@ install="
 	$pkgname.post-deinstall
 	$pkgname-systemd.post-install
 	$pkgname-systemd.post-upgrade
+	$pkgname-systemd.pre-deinstall
 "
 subpackages="
 	$pkgname-systemd

mullvad-vpn-daemon/mullvad-vpn-daemon-systemd.pre-deinstall

@@ -0,0 +1,8 @@
+#!/bin/sh
+set -eu
+
+# Stop and disable all mullvad services
+systemctl stop mullvad-daemon.service || true
+systemctl disable mullvad-daemon.service || true
+systemctl stop mullvad-early-boot-blocking.service || true
+systemctl disable mullvad-early-boot-blocking.service || true

mullvad-vpn-daemon/mullvad-vpn-daemon.post-install

@@ -1,7 +1,7 @@
 #!/bin/sh
 set -eu
 
-# Overwrite the cached relay list with the one embedded in the package.
+# Copy vendored relay list into place
 mkdir -p /var/cache/mullvad-vpn \
   && cp /usr/share/mullvad-vpn/relays.json /var/cache/mullvad-vpn/relays.json \
   || echo "failed to install /var/cache/mullvad-vpn/relays.json"

mullvad-vpn-daemon/mullvad-vpn-daemon.post-upgrade

@@ -1,6 +1,7 @@
 #!/bin/sh
 set -eu
 
-# Overwrite the cached relay list with the one embedded in the package.
-mkdir /var/cache/mullvad-vpn
-cp /usr/share/mullvad-vpn/relays.json /var/cache/mullvad-vpn/relays.json
+# Overwrite the cached relay list with the vendored one.
+mkdir -p /var/cache/mullvad-vpn \
+  && cp /usr/share/mullvad-vpn/relays.json /var/cache/mullvad-vpn/relays.json \
+  || echo "failed to install /var/cache/mullvad-vpn/relays.json"

mullvad-vpn-daemon/mullvad-vpn-daemon.pre-deinstall

@@ -1,11 +1,5 @@
 #!/bin/sh
 set -eu
 
-# the user might've disabled or stopped the service themselves already
-systemctl stop mullvad-daemon.service || true
-systemctl disable mullvad-daemon.service || true
-systemctl stop mullvad-early-boot-blocking.service || true
-systemctl disable mullvad-early-boot-blocking.service || true
-
 mullvad-setup reset-firewall || echo "Failed to reset firewall"
 mullvad-setup remove-device || echo "Failed to remove device from account"