From 86afef4920601f4e8babdfaf15d232ac5aed2979 Mon Sep 17 00:00:00 2001
From: Alexandre Pujol <alexandre@pujol.io>
Date: Sun, 18 May 2025 19:33:58 +0200
Subject: [PATCH] build: improve `just install`

---
 Justfile | 13 ++++++++-----
 PKGBUILD |  3 ++-
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/Justfile b/Justfile
index 1e626dc1c..825097a1b 100644
--- a/Justfile
+++ b/Justfile
@@ -18,7 +18,7 @@
 # Build setings
 destdir := "/"
 build := ".build"
-pkgdest := `pwd` / ".pkg/dist"
+pkgdest := `pwd` / ".pkg"
 pkgname := "apparmor.d"
 
 # Admin username
@@ -86,13 +86,16 @@ install:
 	#!/usr/bin/env bash
 	set -eu -o pipefail
 	install -Dm0755 {{build}}/aa-log {{destdir}}/usr/bin/aa-log
-	for file in $(find "{{build}}/share" -type f -not -name "*.md" -printf "%P\n"); do
+	mapfile -t share < <(find "{{build}}/share" -type f -not -name "*.md" -printf "%P\n")
+	for file in "${share[@]}"; do
 		install -Dm0644 "{{build}}/share/$file" "{{destdir}}/usr/share/$file"
 	done
-	for file in $(find "{{build}}/apparmor.d" -type f -printf "%P\n"); do
+	mapfile -t aa < <(find "{{build}}/apparmor.d" -type f -printf "%P\n")
+	for file in "${aa[@]}"; do
 		install -Dm0644 "{{build}}/apparmor.d/$file" "{{destdir}}/etc/apparmor.d/$file"
 	done
-	for file in $(find "{{build}}/apparmor.d" -type l -printf "%P\n"); do
+	mapfile -t links < <(find "{{build}}/apparmor.d" -type l -printf "%P\n")
+	for file in "${links[@]}"; do
 		mkdir -p "{{destdir}}/etc/apparmor.d/disable"
 		cp -d "{{build}}/apparmor.d/$file" "{{destdir}}/etc/apparmor.d/$file"
 	done
@@ -155,7 +158,7 @@ serve:
 clean:
 	@rm -rf \
 		debian/.debhelper debian/debhelper* debian/*.debhelper debian/{{pkgname}} \
-		.pkg/{{pkgname}}* {{build}} coverage.out
+		{{pkgdest}}/{{pkgname}}* {{build}} coverage.out
 
 [doc('Build the package in a clean OCI container')]
 package dist:
diff --git a/PKGBUILD b/PKGBUILD
index 58a693d34..b48e55153 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -30,7 +30,8 @@ build() {
   export CGO_CXXFLAGS="${CXXFLAGS}"
   export CGO_LDFLAGS="${LDFLAGS}"
   export GOFLAGS="-buildmode=pie -trimpath -ldflags=-linkmode=external -mod=readonly -modcacherw"
-  DISTRIBUTION=arch just complain
+  export DISTRIBUTION=arch
+  just complain
 }
 
 package() {