Merge branch 'trap' into 'master'

fix: avoid overriding traps set up by the setup_workdir function See merge request archlinux/devtools!247
fix(commitpkg): Quiet git ls-files output
2025-11-04 01:34:42 +01:00 · 2025-08-03 18:15:46 +00:00 · 2025-08-01 11:26:57 +02:00 · 2025-07-28 23:38:32 -04:00 · 2025-07-18 19:08:52 +00:00
6 changed files with 14 additions and 8 deletions
--- a/src/checkpkg.in
+++ b/src/checkpkg.in
@@ -90,7 +90,11 @@ if [[ ${arch[0]} == 'any' ]]; then
 fi

 STARTDIR=$(pwd)
-(( RMDIR )) && trap 'rm -rf $TEMPDIR' EXIT INT TERM QUIT
+if (( RMDIR )); then
+	# lib/common.sh sets up traps for cleanup, the following will override them
+	trap 'rm -rf "$TEMPDIR"; trap_abort' INT QUIT TERM HUP
+	trap 'rm -rf "$TEMPDIR"; trap_exit' EXIT
+fi
 TEMPDIR=$(mktemp -d --tmpdir checkpkg-script.XXXX)

 for _pkgname in "${pkgname[@]}"; do
--- a/src/commitpkg.in
+++ b/src/commitpkg.in
@@ -155,7 +155,7 @@ if (( ${#needsversioning[*]} )); then
 		if [[ ! -f "${file}" ]]; then
 			continue
 		fi
-		if ! git ls-files --error-unmatch "$file"; then
+		if ! git ls-files --error-unmatch "$file" >/dev/null; then
 			die "%s is not under version control" "$file"
 		fi
 	done
--- a/src/diffpkg.in
+++ b/src/diffpkg.in
@@ -182,8 +182,8 @@ elif [[ -r "$HOME/.makepkg.conf" ]]; then
 fi

 STARTDIR=$(pwd)
-trap 'rm -rf $TMPDIR' EXIT INT TERM QUIT
-TMPDIR=$(mktemp -d --tmpdir diffpkg-script.XXXXXXXX)
+[[ -z ${WORKDIR:-} ]] && setup_workdir
+TMPDIR=$(mktemp -d --tmpdir="$WORKDIR" diffpkg-script.XXXXXXXX)
 export TMPDIR

 tar_list() {
--- a/src/export-pkgbuild-keys.in
+++ b/src/export-pkgbuild-keys.in
@@ -50,8 +50,8 @@ if (( ${#validpgpkeys[@]} == 0 )); then
 	exit 0
 fi

-trap 'rm -rf $TEMPDIR' EXIT INT TERM QUIT
-TEMPDIR=$(mktemp -d --tmpdir export-pkgbuild-keys.XXXXXXXXXX)
+[[ -z ${WORKDIR:-} ]] && setup_workdir
+TEMPDIR=$(mktemp -d --tmpdir="$WORKDIR" export-pkgbuild-keys.XXXXXXXXXX)

 mkdir -p keys/pgp
 error=0
--- a/src/lib/license/setup.sh
+++ b/src/lib/license/setup.sh
@@ -191,7 +191,9 @@ path = [
    ".nvchecker.toml",
    "*.install",
    "*.sysusers",
+    "*sysusers.conf",
    "*.tmpfiles",
+    "*tmpfiles.conf",
    "*.logrotate",
    "*.pam",
    "*.service",
--- a/src/makerepropkg.in
+++ b/src/makerepropkg.in
@@ -242,8 +242,8 @@ for fname in "${installed[@]}"; do
    fi
 done

-trap 'rm -rf $TEMPDIR' EXIT INT TERM QUIT
-TEMPDIR=$(mktemp -d --tmpdir makerepropkg.XXXXXXXXXX)
+[[ -z ${WORKDIR:-} ]] && setup_workdir
+TEMPDIR=$(mktemp -d --tmpdir="$WORKDIR" makerepropkg.XXXXXXXXXX)

 makepkg_conf="${TEMPDIR}/makepkg.conf"
 # anything before buildtool support is pinned to the last none buildtool aware release
Author	SHA1	Message	Date
Jakub Klinkovský	bab4025a6d	Merge branch 'trap' into 'master' fix: avoid overriding traps set up by the setup_workdir function See merge request archlinux/devtools!247	2025-08-03 18:15:46 +00:00
Christian Heusel	01757e6904	fix(commitpkg): Quiet git ls-files output So far all files in `needsversioning=(...)` have been printed to the command line if they were found, which is not useful, especially now that we have more files present there. It makes sense however to keep the standard error output, as this gives a actionable suggestion what one should to to fix the issue: > error: pathspec 'PKGBUILD' did not match any file(s) known to git > Did you forget to 'git add'? Fixes #281 Signed-off-by: Christian Heusel <christian@heusel.eu>	2025-08-01 11:26:57 +02:00
Daniel M. Capella	c5fe8ff3e6	feat(license): Extend matches for sysusers/tmpfiles configs Eg. to match: - sysusers.conf - $pkgname.sysusers - $pkgname.sysusers.conf	2025-07-28 23:38:32 -04:00
Jakub Klinkovský	6370142696	Avoid overriding traps set up by the setup_workdir function Bash traps for each signal are not composable, but rather override each other. Scripts should either place their temporary files in the common $WORKDIR and rely on the common traps to do the cleanup, or call the common trap_abort/trap_exit functions from the new traps.	2025-07-18 19:08:52 +00:00