]> git.ipfire.org Git - thirdparty/ccache.git/commitdiff
fix: Pass template argument to mktemp(1) for portability to macOS/BSD
authorJoel Rosdahl <joel@rosdahl.net>
Mon, 9 Mar 2026 19:48:14 +0000 (20:48 +0100)
committerJoel Rosdahl <joel@rosdahl.net>
Mon, 9 Mar 2026 20:03:34 +0000 (21:03 +0100)
Fixes #1692.

ci/build-and-verify-package
ci/build-and-verify-source-package
ci/prepare-release
doc/scripts/generate-manpage
doc/scripts/generate-markdown
misc/format-files
test/suites/remote_redis_unix.bash

index 4a06796521a11b2c898033db54c31c2da2f23bf3..59effb820dee66cf9ba863af6399ea8c4aee52f5 100755 (executable)
@@ -13,7 +13,7 @@ cmake ..
 ninja -v package
 
 # Get out of git directory just to be sure.
-tmp_dir=$(mktemp -d)
+tmp_dir=$(mktemp -d "${TMPDIR:-/tmp}/tmp.XXXXXX")
 trap "rm -rf $tmp_dir" EXIT
 
 tar -xf ccache-*.tar.xz -C $tmp_dir
index dc7375eddd2b54ddce118b2ca8de92acb1daa7de..d23bb7e3b87412c863d3602f53c92002e22b3e4a 100755 (executable)
@@ -12,7 +12,7 @@ unset CI
 # without resorting to setting base_dir.
 export CMAKE_GENERATOR=Ninja
 
-tmp_dir=$(mktemp -d)
+tmp_dir=$(mktemp -d "${TMPDIR:-/tmp}/tmp.XXXXXX")
 trap "rm -rf $tmp_dir" EXIT
 
 git archive --prefix=ccache/ -o $tmp_dir/ccache.tar.gz HEAD
index be1e3ac132ee4c8f3bcd9f23730c76e81720a57a..43a939207faf1f5cf9c7150fa45f689bb853bda1 100755 (executable)
@@ -44,7 +44,7 @@ test_posix_binary_release() {
 
     local name="ccache-${VERSION}-${arch}"
 
-    tmpdir=$(mktemp -d)
+    tmpdir=$(mktemp -d "${TMPDIR:-/tmp}/tmp.XXXXXX")
     tar -C "${tmpdir}" -xf "${PWD}/release/${name}.tar.${compression}"
     (
         cd "${tmpdir}/${name}"
index 10795bde489892fb9c3ec19211c0f85a379eb9dd..2e334ff40fc4cbd47004e083b329e81f675ad1d4 100755 (executable)
@@ -9,7 +9,7 @@ version=$4
 input=$5
 output=$6
 
-tmpfile=$(mktemp)
+tmpfile=$(mktemp "${TMPDIR:-/tmp}/tmp.XXXXXX")
 trap 'rm -f "${tmpfile}"' EXIT
 
 "${asciidoctor}" \
index dfa28cf1686600e16bc395d5fa5b9522087ed675..16341348fa4d9881bddd17ff7c3a9259c324e1c2 100755 (executable)
@@ -9,7 +9,7 @@ version=$4
 input=$5
 output=$6
 
-tmpfile=$(mktemp)
+tmpfile=$(mktemp "${TMPDIR:-/tmp}/tmp.XXXXXX")
 trap 'rm -f "${tmpfile}"' EXIT
 
 "${asciidoctor}" \
index 6671f8e1d0cb952a99e929f135e1a256663d71e8..cd7863d60efc42c4816d29fe557e190e5d9d9401 100755 (executable)
@@ -2,7 +2,7 @@
 
 set -eu
 
-tmp_file=$(mktemp)
+tmp_file=$(mktemp "${TMPDIR:-/tmp}/tmp.XXXXXX")
 trap "rm $tmp_file" EXIT
 
 all=
index 1d709b55998e305cfe28b0eda4ca89d4ddd3fec3..2562a3087f5a9a14b5dac9ffca02911c96aa7041 100644 (file)
@@ -61,7 +61,7 @@ SUITE_remote_redis_unix() {
     # -------------------------------------------------------------------------
     TEST "Base case"
 
-    socket=$(mktemp)
+    socket=$(mktemp "${TMPDIR:-/tmp}/tmp.XXXXXX")
     redis_url="redis+unix:${socket}"
     export CCACHE_REMOTE_STORAGE="${redis_url}"
 
@@ -92,7 +92,7 @@ SUITE_remote_redis_unix() {
     # -------------------------------------------------------------------------
     TEST "Password"
 
-    socket=$(mktemp)
+    socket=$(mktemp "${TMPDIR:-/tmp}/tmp.XXXXXX")
     password=secret123
     redis_url="redis+unix://${password}@localhost${socket}"
     export CCACHE_REMOTE_STORAGE="${redis_url}"