From 045f20a120e58c79df65a094e266e51e2e913a42 Mon Sep 17 00:00:00 2001
From: Joakim Hulthe <joakim@hulthe.net>
Date: Sun, 26 Apr 2026 16:40:47 +0200
Subject: [PATCH] Make package function more compact

---
 mullvad-vpn-daemon/APKBUILD | 34 +++++++++++-----------------------
 1 file changed, 11 insertions(+), 23 deletions(-)

diff --git a/mullvad-vpn-daemon/APKBUILD b/mullvad-vpn-daemon/APKBUILD
index b575b06..213b4b9 100644
--- a/mullvad-vpn-daemon/APKBUILD
+++ b/mullvad-vpn-daemon/APKBUILD
@@ -61,17 +61,11 @@ check() {
 }
 
 package() {
-	install -m755 -D "$_cargo_release_dir/mullvad" \
-		"$pkgdir/usr/bin/mullvad"
-
-	install -m755 -D "$_cargo_release_dir/mullvad-daemon" \
-		"$pkgdir/usr/bin/mullvad-daemon"
-
-	install -m755 -D "$_cargo_release_dir/mullvad-problem-report" \
-		"$pkgdir/usr/bin/mullvad-problem-report"
-
-	install -m755 -D "$_cargo_release_dir/mullvad-setup" \
-		"$pkgdir/usr/bin/mullvad-setup"
+	install -m755 -Dt "$pkgdir/usr/bin/" \
+		"$_cargo_release_dir/mullvad" \
+		"$_cargo_release_dir/mullvad-daemon" \
+		"$_cargo_release_dir/mullvad-problem-report" \
+		"$_cargo_release_dir/mullvad-setup"		
 
 	# TODO: Bundle a relay list.
 	# We can't generate one at build time since that would break build reproducibility.
@@ -79,25 +73,19 @@ package() {
 	#install -m644 -D "$builddir/<todo>/relays.json" \
 	#	"$pkgdir/usr/share/mullvad-vpn/relays.json"
 	# TODO: Copy relay list into /var/cache/ in post-upgrade/post-install
-}
 
-systemd() {
-	pkgdesc="systemd service files for Mullvad VPN"
-	depends="$pkgname=$pkgver-r$pkgrel"
-
-	install -m755 -D "$builddir/dist-assets/linux/mullvad-daemon.service" \
-		"$subpkgdir/usr/lib/systemd/system/mullvad-daemon.service"
-
-	install -m755 -D "$builddir/dist-assets/linux/mullvad-early-boot-blocking.service" \
-		"$subpkgdir/usr/lib/systemd/system/mullvad-early-boot-blocking.service"
+	# files in /usr/lib/systemd/ are automatically put in systemd subpackage
+	install -m755 -Dt "$pkgdir/usr/lib/systemd/system/" \
+		"$builddir/dist-assets/linux/mullvad-daemon.service" \
+		"$builddir/dist-assets/linux/mullvad-early-boot-blocking.service"
 }
 
 suid() {
 	pkgdesc="mullvad-exclude cli for split tunneling"
 	depends="$pkgname=$pkgver-r$pkgrel"
 
-	install -m4755 -D "$_cargo_release_dir/mullvad-exclude" \
-		"$subpkgdir/usr/bin/mullvad-exclude"
+	install -m4755 -Dt "$subpkgdir/usr/bin/" \
+		"$_cargo_release_dir/mullvad-exclude"
 }
 
 sha512sums="