summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlastair Hughes <hobbitalastair@gmail.com>2015-12-31 01:10:21 +0100
committerAllan McRae <allan@archlinux.org>2016-01-04 04:27:08 +0100
commit6aee32102f667a18b050e934759585260cae9ae6 (patch)
tree7a60178b2c3fc4575335b2cba5f7b1c81d695e88
parent774c7eb24dde6d72d7a9d9e7d6ae248a5a35f480 (diff)
downloadpacman-6aee32102f667a18b050e934759585260cae9ae6.tar.gz
pacman-6aee32102f667a18b050e934759585260cae9ae6.tar.xz
Replace mktemp's --tmpdir option with shell code.
bacman and updpkgsums used GNU mktemp's --tmpdir option, which is not supported by some other implementations (including busybox). Replace that with shell code. Signed-off-by: Alastair Hughes <hobbitalastair@gmail.com> Signed-off-by: Allan McRae <allan@archlinux.org>
-rw-r--r--contrib/bacman.sh.in2
-rw-r--r--contrib/updpkgsums.sh.in4
2 files changed, 3 insertions, 3 deletions
diff --git a/contrib/bacman.sh.in b/contrib/bacman.sh.in
index fcee6a0d..b4bbbbb2 100644
--- a/contrib/bacman.sh.in
+++ b/contrib/bacman.sh.in
@@ -147,7 +147,7 @@ fi
# Begin
#
msg "Package: ${pkg_namver}"
-work_dir=$(mktemp -d --tmpdir bacman.XXXXXXXXXX)
+work_dir=$(mktemp -d "${TMPDIR:-/tmp}/bacman.XXXXXXXXXX")
cd "$work_dir" || exit 1
#
diff --git a/contrib/updpkgsums.sh.in b/contrib/updpkgsums.sh.in
index 7b92efe3..aaed700a 100644
--- a/contrib/updpkgsums.sh.in
+++ b/contrib/updpkgsums.sh.in
@@ -79,8 +79,8 @@ if [[ ! -w . ]]; then
fi
# Generate the new sums
-export BUILDDIR=$(mktemp -d --tmpdir updpkgsums.XXXXXX)
-newbuildfile=$(mktemp --tmpdir updpkgsums.XXXXXX)
+export BUILDDIR=$(mktemp -d "${TMPDIR:-/tmp}/updpkgsums.XXXXXX")
+newbuildfile=$(mktemp "${TMPDIR:-/tmp}/updpkgsums.XXXXXX")
trap "rm -rf '$BUILDDIR' '$newbuildfile'" EXIT
newsums=$(makepkg -g -p "$buildfile") || die 'Failed to generate new checksums'