From 633a9409ae245b06ad5ae6a9b68853879cad03dc Mon Sep 17 00:00:00 2001
From: Erich Eckner <git@eckner.net>
Date: Thu, 18 Jan 2018 15:21:01 +0100
Subject: put name of creating script into name of temporary directories

---
 bin/bootstrap-mysql              |  2 +-
 bin/build-master-status          |  2 +-
 bin/build-packages               |  4 ++--
 bin/calculate-dependent-packages |  2 +-
 bin/check-bugtracker             |  2 +-
 bin/clean-cache                  |  2 +-
 bin/common-functions             | 14 +++++++-------
 bin/db-update                    |  2 +-
 bin/delete-packages              |  2 +-
 bin/get-assignment               |  2 +-
 bin/get-package-updates          |  2 +-
 bin/interpret-mail               |  2 +-
 bin/modify-package-state         |  2 +-
 bin/mysql-functions              |  4 ++--
 bin/return-assignment            |  2 +-
 bin/sanity-check                 |  2 +-
 bin/seed-build-list              |  2 +-
 bin/show-dependencies            |  4 ++--
 bin/strict-bashism-check         |  2 +-
 bin/why-dont-you                 |  2 +-
 20 files changed, 29 insertions(+), 29 deletions(-)

(limited to 'bin')

diff --git a/bin/bootstrap-mysql b/bin/bootstrap-mysql
index 3fa2da3..8545ab8 100755
--- a/bin/bootstrap-mysql
+++ b/bin/bootstrap-mysql
@@ -4,7 +4,7 @@
 . "${0%/*}/../conf/default.conf"
 . "${0%/*}/mysql-functions"
 
-tmp_dir=$(mktemp -d)
+tmp_dir=$(mktemp -d 'tmp.bootstrap-mysql.XXXXXXXXXX' --tmpdir)
 trap 'rm -rf --one-file-system "${tmp_dir}"' EXIT
 
 for dir in $(ls_master_mirror 'i686'); do
diff --git a/bin/build-master-status b/bin/build-master-status
index 6e830ca..4d47976 100755
--- a/bin/build-master-status
+++ b/bin/build-master-status
@@ -58,7 +58,7 @@ if [ -s "${work_dir}/build-master-sanity" ]; then
   exit
 fi
 
-tmp_dir=$(mktemp -d)
+tmp_dir=$(mktemp -d 'tmp.build-master-status.XXXXXXXXXX' --tmpdir)
 trap 'rm -rf --one-file-system "${tmp_dir}"' EXIT
 
 stable=$(
diff --git a/bin/build-packages b/bin/build-packages
index d827cdb..81afa7f 100755
--- a/bin/build-packages
+++ b/bin/build-packages
@@ -220,7 +220,7 @@ while [ "${count}" -ne 0 ]; do
       if [ "${mod_git_revision}" = 'work-tree' ]; then
         mod_git_revision=$(
           # we can't just create an empty index-file with mktemp, because git doesn't like it
-          tmp_subdir=$(mktemp -d);
+          tmp_subdir=$(mktemp -d 'tmp.build-packages.git.XXXXXXXXXX' --tmpdir)
           trap 'rm -rf --one-file-system "${tmp_subdir}"' EXIT
           export GIT_INDEX_FILE="${tmp_subdir}/index.new"
           git -C "${repo_paths__archlinux32}" add -A
@@ -253,7 +253,7 @@ while [ "${count}" -ne 0 ]; do
         recursively_umount_and_rm "${tmp_dir}"
         exit "${err}"
       }
-      tmp_dir=$(mktemp -d "${work_dir}/tmp.XXXXXX")
+      tmp_dir=$(mktemp -d "${work_dir}/tmp.build-packages.XXXXXX")
       trap bail_out EXIT
 
       extract_source_directory "${git_repo}" "${git_revision}" "${mod_git_revision}" "${tmp_dir}" "${sub_pkgrel}"
diff --git a/bin/calculate-dependent-packages b/bin/calculate-dependent-packages
index e508d4e..bfb87a1 100755
--- a/bin/calculate-dependent-packages
+++ b/bin/calculate-dependent-packages
@@ -8,7 +8,7 @@ if [ -s "${work_dir}/build-master-sanity" ]; then
   exit
 fi
 
-tmp_dir=$(mktemp -d)
+tmp_dir=$(mktemp -d 'tmp.calculate-dependent-packages.XXXXXXXXXX' --tmpdir)
 trap 'rm -rf --one-file-system "${tmp_dir}"' EXIT
 
 sort -k1,1 -u "${work_dir}/build-list" > \
diff --git a/bin/check-bugtracker b/bin/check-bugtracker
index 8fe81d9..46e78db 100755
--- a/bin/check-bugtracker
+++ b/bin/check-bugtracker
@@ -8,7 +8,7 @@
 # shellcheck source=conf/default.conf
 . "${0%/*}/../conf/default.conf"
 
-tmp_dir=$(mktemp -d)
+tmp_dir=$(mktemp -d 'tmp.check-bugtracker.XXXXXXXXXX' --tmpdir)
 trap 'rm -rf --one-file-system "${tmp_dir}"' EXIT
 
 receive_buglist 'Testing' | \
diff --git a/bin/clean-cache b/bin/clean-cache
index 42dae59..6e674f9 100755
--- a/bin/clean-cache
+++ b/bin/clean-cache
@@ -22,7 +22,7 @@ mirror=$(
     sed 's|^\s*||'
 )
 
-tmp_dir=$(mktemp -d)
+tmp_dir=$(mktemp -d 'tmp.clean-cache.XXXXXXXXXX' --tmpdir)
 trap 'rm -rf --one-file-system "${tmp_dir}"' EXIT
 
 for repo in ${repos}; do
diff --git a/bin/common-functions b/bin/common-functions
index a972310..1fd5db7 100755
--- a/bin/common-functions
+++ b/bin/common-functions
@@ -249,7 +249,7 @@ delete_old_metadata() {
     # build-list items should stay
     sed 'p' "${work_dir}/build-list"
 
-    tmp_dir=$(mktemp -d)
+    tmp_dir=$(mktemp -d 'tmp.common-functions.delete_old_metadata.XXXXXXXXXX' --tmpdir)
     trap 'rm -rf --one-file-system "${tmp_dir}"' EXIT
 
     echo "${current_metadata}" | \
@@ -467,7 +467,7 @@ remove_old_package_versions() {
   fi
 
   ( # the new shell is intentional
-    tmp_dir=$(mktemp -d)
+    tmp_dir=$(mktemp -d 'tmp.common-functions.remove_old_package_versions.XXXXXXXXXX' --tmpdir)
     trap 'rm -rf --one-file-system "${tmp_dir}"' EXIT
 
     {
@@ -629,7 +629,7 @@ make_source_info() {
 
   ( # the new shell is intentional
 
-    tmp_dir=$(mktemp -d "${work_dir}/tmp.XXXXXX")
+    tmp_dir=$(mktemp -d "${work_dir}/tmp.make_source_info.XXXXXX")
     trap 'rm -rf --one-file-system "${tmp_dir}"' EXIT
 
     extract_source_directory "${git_repo}" "${git_revision}" "${mod_git_revision}" "${tmp_dir}" '0'
@@ -862,7 +862,7 @@ download_sources_by_hash() {
   local sum_type
   local arch_suffix
 
-  tmp_dir=$(mktemp -d)
+  tmp_dir=$(mktemp -d 'tmp.common-functions.download_sources_by_hash.XXXXXXXXXX' --tmpdir)
 
   if ! make_source_info "${package}" "${repository}" "${git_revision}" "${git_mod_revision}" "${tmp_dir}/.SRCINFO"; then
     >&2 echo 'download_sources_by_hash: make_source_info failed.'
@@ -1002,7 +1002,7 @@ find_biggest_subset_of_packages() {
     sort -u "${omega}" | \
       sponge "${omega}"
 
-    temp_dir=$(mktemp -d)
+    temp_dir=$(mktemp -d 'tmp.common-functions.find_biggest_subset_of_packages.XXXXXXXXXX' --tmpdir)
     trap 'rm -rf --one-file-system "${temp_dir}"' EXIT
 
     {
@@ -1232,7 +1232,7 @@ next_sub_pkgrel() {
     repository="$4"
     git_repo=$(find_git_repository_to_package_repository "${repository}")
 
-    temp_dir=$(mktemp -d)
+    temp_dir=$(mktemp -d 'tmp.common-functions.next_sub_pkgrel.XXXXXXXXXX' --tmpdir)
 
     find_pkgbuilds "${package}" "${repository}" "${git_repo}" "${git_revision}" "${mod_git_revision}"
     extract_source_directory "${git_repo}" "${git_revision}" "${mod_git_revision}" "${temp_dir}" '0'
@@ -1310,7 +1310,7 @@ modification_revision_link() {
 trigger_mirror_refreshs() {
   local tmp_file
 
-  tmp_file=$(mktemp)
+  tmp_file=$(mktemp "tmp.common-functions.trigger_mirror_refreshs.XXXXXXXXXX" --tmpdir)
   date '+%s' > \
     "${tmp_file}"
   ${master_mirror_rsync_command} \
diff --git a/bin/db-update b/bin/db-update
index 5f19a28..827dc05 100755
--- a/bin/db-update
+++ b/bin/db-update
@@ -388,7 +388,7 @@ if [ -s "${work_dir}/build-master-sanity" ]; then
   exit
 fi
 
-tmp_dir=$(mktemp -d "${work_dir}/tmp.XXXXXX")
+tmp_dir=$(mktemp -d "${work_dir}/tmp.db-update.XXXXXXXXXX")
 trap 'rm -rf --one-file-system "${tmp_dir}"' EXIT
 
 for package in ${packages_to_force_stabilize}; do
diff --git a/bin/delete-packages b/bin/delete-packages
index f95fb8e..a6e3f14 100755
--- a/bin/delete-packages
+++ b/bin/delete-packages
@@ -67,7 +67,7 @@ if [ -s "${work_dir}/build-master-sanity" ]; then
   exit
 fi
 
-tmp_dir=$(mktemp -d "${work_dir}/tmp.XXXXXX")
+tmp_dir=$(mktemp -d "${work_dir}/tmp.delete-packages.XXXXXXXXXX")
 trap 'rm -rf --one-file-system "${tmp_dir}"' EXIT
 
 # Create a lock file and a trap.
diff --git a/bin/get-assignment b/bin/get-assignment
index 00d32fd..f1199cc 100755
--- a/bin/get-assignment
+++ b/bin/get-assignment
@@ -85,7 +85,7 @@ clean_up() {
   rm -rf --one-file-system "${tmp_dir}"
 }
 
-tmp_dir=$(mktemp -d)
+tmp_dir=$(mktemp -d 'tmp.get-assignment.XXXXXXXXXX' --tmpdir)
 trap clean_up EXIT
 
 # Check if there are any pending packages at all and if the requester
diff --git a/bin/get-package-updates b/bin/get-package-updates
index 8e0df04..cbe8b14 100755
--- a/bin/get-package-updates
+++ b/bin/get-package-updates
@@ -91,7 +91,7 @@ delete_package() {
 }
 
 # create tmp_dir and trap
-tmp_dir=$(mktemp -d)
+tmp_dir=$(mktemp -d 'tmp.get-package-updates.XXXXXXXXXX' --tmpdir)
 trap 'rm -rf --one-file-system "${tmp_dir}"' EXIT
 
 # Update git repositories (official packages, community packages and the repository of package customizations).
diff --git a/bin/interpret-mail b/bin/interpret-mail
index 2b2974f..d16c07f 100755
--- a/bin/interpret-mail
+++ b/bin/interpret-mail
@@ -83,7 +83,7 @@ run_and_log_on_error() {
   fi
 }
 
-tmp_dir=$(mktemp -d)
+tmp_dir=$(mktemp -d 'tmp.interpret-mail.XXXXXXXXXX' --tmpdir)
 trap 'rm -rf --one-file-system "${tmp_dir}"' EXIT
 
 cat > \
diff --git a/bin/modify-package-state b/bin/modify-package-state
index 74054b5..c740d3d 100755
--- a/bin/modify-package-state
+++ b/bin/modify-package-state
@@ -98,7 +98,7 @@ fi
 clean_up() {
   rm -rf --one-file-system "${tmp_dir}"
 }
-tmp_dir=$(mktemp -d)
+tmp_dir=$(mktemp -d 'tmp.modify-package-state.XXXXXXXXXX' --tmpdir)
 trap clean_up EXIT
 
 input_file="$1"
diff --git a/bin/mysql-functions b/bin/mysql-functions
index 1d1169b..14966d2 100755
--- a/bin/mysql-functions
+++ b/bin/mysql-functions
@@ -202,7 +202,7 @@ mysql_generate_package_metadata() {
     git_revision="$2"
     mod_git_revision="$3"
     repository="$4"
-    temp_dir=$(mktemp -d)
+    temp_dir=$(mktemp -d 'tmp.mysql-functions.mysql_generate_package_metadata.XXXXXXXXXX' --tmpdir)
     trap 'rm -rf --one-file-system "${temp_dir}"' EXIT
 
     if [ $# -eq 1 ]; then
@@ -578,7 +578,7 @@ mysql_generate_package_metadata() {
 
 mysql_sanity_check() {
   ( # new shell is intentional
-    temp_dir=$(mktemp -d)
+    temp_dir=$(mktemp -d 'tmp.mysql-functions.mysql_sanity_check.XXXXXXXXXX' --tmpdir)
     trap 'rm -rf --one-file-system "${temp_dir}"' EXIT
 
     for dir in $(ls_master_mirror 'i686'); do
diff --git a/bin/return-assignment b/bin/return-assignment
index ac430f2..fceff50 100755
--- a/bin/return-assignment
+++ b/bin/return-assignment
@@ -193,7 +193,7 @@ clean_up_tmp_dir() {
   clean_up_lock_file
 }
 
-tmp_dir=$(mktemp -d "${work_dir}/tmp.XXXXXX")
+tmp_dir=$(mktemp -d "${work_dir}/tmp.return-assignment.XXXXXXXXXX")
 cd "${tmp_dir}"
 trap clean_up_tmp_dir EXIT
 
diff --git a/bin/sanity-check b/bin/sanity-check
index 6e78928..65ac5f3 100755
--- a/bin/sanity-check
+++ b/bin/sanity-check
@@ -98,7 +98,7 @@ finish() {
   rm -rf --one-file-system "${tmp_dir}"
 }
 
-tmp_dir=$(mktemp -d)
+tmp_dir=$(mktemp -d 'tmp.sanity-check.XXXXXXXXXX' --tmpdir)
 touch "${tmp_dir}/messages"
 trap 'finish' EXIT
 
diff --git a/bin/seed-build-list b/bin/seed-build-list
index cfe4bab..feea704 100755
--- a/bin/seed-build-list
+++ b/bin/seed-build-list
@@ -27,7 +27,7 @@ usage() {
   [ -z "$1" ] && exit 1 || exit "$1"
 }
 
-tmp_dir=$(mktemp -d)
+tmp_dir=$(mktemp -d 'tmp.seed-build-list.XXXXXXXXXX' --tmpdir)
 # shellcheck disable=SC2064
 trap "rm -rf --one-file-system '${tmp_dir:?}'" EXIT
 
diff --git a/bin/show-dependencies b/bin/show-dependencies
index 9593593..efdf745 100755
--- a/bin/show-dependencies
+++ b/bin/show-dependencies
@@ -13,7 +13,7 @@ if [ $# -eq 0 ]; then
   )
   new_sum='x'
   sum=''
-  tmp_dir=$(mktemp -d)
+  tmp_dir=$(mktemp -d 'tmp.show-dependencies.0.XXXXXXXXXX' --tmpdir)
   trap 'rm -rf --one-file-system "${tmp_dir}"' EXIT
   find "${work_dir}/package-infos" -maxdepth 1 -name '*.builds' -exec \
     grep -HF '' {} \; | \
@@ -116,7 +116,7 @@ if ! flock -s -n 8; then
   exit
 fi
 
-tmp_dir=$(mktemp -d)
+tmp_dir=$(mktemp -d 'tmp.show-dependencies.1.XXXXXXXXXX' --tmpdir)
 trap 'rm -rf --one-file-system "${tmp_dir}"' EXIT
 
 sort -u "${work_dir}/build-order" | \
diff --git a/bin/strict-bashism-check b/bin/strict-bashism-check
index 15fff71..3bb3884 100755
--- a/bin/strict-bashism-check
+++ b/bin/strict-bashism-check
@@ -43,7 +43,7 @@ git diff-index --check --cached $against -- || exit $?
 
 tree=$(git write-tree)
 
-tmp_dir=$(mktemp -d)
+tmp_dir=$(mktemp -d 'tmp.strict-bashism-check.XXXXXXXXXX' --tmpdir)
 trap 'rm -rf --one-file-system "${tmp_dir}"' EXIT
 
 git archive "${tree}" | \
diff --git a/bin/why-dont-you b/bin/why-dont-you
index c6a6138..2e3ea86 100755
--- a/bin/why-dont-you
+++ b/bin/why-dont-you
@@ -10,7 +10,7 @@
 action="$1"
 shift
 
-tmp_dir=$(mktemp -d)
+tmp_dir=$(mktemp -d 'tmp.why-dont-you.XXXXXXXXXX' --tmpdir)
 trap 'rm -rf --one-file-system "${tmp_dir}"' EXIT
 
 case "${action}" in
-- 
cgit v1.2.3-54-g00ecf