Merge branch 'trap' into 'master'

fix: avoid overriding traps set up by the setup_workdir function

See merge request archlinux/devtools!247

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

src/diffpkg.in

@@ -182,8 +182,8 @@ elif [[ -r "$HOME/.makepkg.conf" ]]; then
 fi
 
 STARTDIR=$(pwd)
-trap 'rm -rf $TMPDIR' EXIT INT TERM QUIT
+[[ -z ${WORKDIR:-} ]] && setup_workdir
-TMPDIR=$(mktemp -d --tmpdir diffpkg-script.XXXXXXXX)
+TMPDIR=$(mktemp -d --tmpdir="$WORKDIR" diffpkg-script.XXXXXXXX)
 export TMPDIR
 
 tar_list() {

src/export-pkgbuild-keys.in

@@ -50,8 +50,8 @@ if (( ${#validpgpkeys[@]} == 0 )); then
 	exit 0
 fi
 
-trap 'rm -rf $TEMPDIR' EXIT INT TERM QUIT
+[[ -z ${WORKDIR:-} ]] && setup_workdir
-TEMPDIR=$(mktemp -d --tmpdir export-pkgbuild-keys.XXXXXXXXXX)
+TEMPDIR=$(mktemp -d --tmpdir="$WORKDIR" export-pkgbuild-keys.XXXXXXXXXX)
 
 mkdir -p keys/pgp
 error=0

src/lib/license/setup.sh

@@ -188,6 +188,7 @@ path = [
     "README.md",
     "keys/**",
     ".SRCINFO",
+    ".gitignore",
     ".nvchecker.toml",
     "*.install",
     "*.sysusers",

src/makerepropkg.in

@@ -242,8 +242,8 @@ for fname in "${installed[@]}"; do
     fi
 done
 
-trap 'rm -rf $TEMPDIR' EXIT INT TERM QUIT
+[[ -z ${WORKDIR:-} ]] && setup_workdir
-TEMPDIR=$(mktemp -d --tmpdir makerepropkg.XXXXXXXXXX)
+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