build-support: Fix nix-prefetch-* on OS X.
Fixes a regression on OS X introduced by f83af95
.
Don't use --tmpdir for mktemp, because that flag doesn't exist on OS X.
However, using -t is deprecated in GNU coreutils, so as suggested by
@ip1981 we're now using parameter expansion on ${TMPDIR:-/tmp} to
provide /tmp as a fallback if TMPDIR is not set and use it instead.
Also use this approach for nix-prefetch-cvs now in order to stay
consistent.
Reported-by: Vladimir Kirillov <proger@wilab.org.ua>
Tested-by: Igor Pashev <pashev.igor@gmail.com>
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
This commit is contained in:
parent
df30066790
commit
5e7a1cf955
|
@ -43,7 +43,7 @@ fi
|
||||||
# If we don't know the hash or a path with that hash doesn't exist,
|
# If we don't know the hash or a path with that hash doesn't exist,
|
||||||
# download the file and add it to the store.
|
# download the file and add it to the store.
|
||||||
if test -z "$finalPath"; then
|
if test -z "$finalPath"; then
|
||||||
tmpPath="$(mktemp --tmpdir -d bzr-checkout-tmp-XXXXXXXX)"
|
tmpPath="$(mktemp -d "${TMPDIR:-/tmp}/bzr-checkout-tmp-XXXXXXXX")"
|
||||||
trap "rm -rf \"$tmpPath\"" EXIT
|
trap "rm -rf \"$tmpPath\"" EXIT
|
||||||
|
|
||||||
tmpFile="$tmpPath/$dstFile"
|
tmpFile="$tmpPath/$dstFile"
|
||||||
|
|
|
@ -20,7 +20,7 @@ fi
|
||||||
|
|
||||||
|
|
||||||
mkTempDir() {
|
mkTempDir() {
|
||||||
tmpPath=$(mktemp -d -t nix-prefetch-cvs-XXXXXXXX)
|
tmpPath="$(mktemp -d "${TMPDIR:-/tmp}/nix-prefetch-cvs-XXXXXXXX")"
|
||||||
trap removeTempDir EXIT SIGINT SIGQUIT
|
trap removeTempDir EXIT SIGINT SIGQUIT
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -256,7 +256,7 @@ else
|
||||||
# download the file and add it to the store.
|
# download the file and add it to the store.
|
||||||
if test -z "$finalPath"; then
|
if test -z "$finalPath"; then
|
||||||
|
|
||||||
tmpPath="$(mktemp --tmpdir -d git-checkout-tmp-XXXXXXXX)"
|
tmpPath="$(mktemp -d "${TMPDIR:-/tmp}/git-checkout-tmp-XXXXXXXX")"
|
||||||
trap "rm -rf \"$tmpPath\"" EXIT
|
trap "rm -rf \"$tmpPath\"" EXIT
|
||||||
|
|
||||||
tmpFile="$tmpPath/git-export"
|
tmpFile="$tmpPath/git-export"
|
||||||
|
|
|
@ -35,7 +35,7 @@ fi
|
||||||
# download the file and add it to the store.
|
# download the file and add it to the store.
|
||||||
if test -z "$finalPath"; then
|
if test -z "$finalPath"; then
|
||||||
|
|
||||||
tmpPath="$(mktemp --tmpdir -d hg-checkout-tmp-XXXXXXXX)"
|
tmpPath="$(mktemp -d "${TMPDIR:-/tmp}/hg-checkout-tmp-XXXXXXXX")"
|
||||||
trap "rm -rf \"$tmpPath\"" EXIT
|
trap "rm -rf \"$tmpPath\"" EXIT
|
||||||
|
|
||||||
tmpArchive="$tmpPath/hg-archive"
|
tmpArchive="$tmpPath/hg-archive"
|
||||||
|
|
|
@ -41,7 +41,7 @@ fi
|
||||||
# If we don't know the hash or a path with that hash doesn't exist,
|
# If we don't know the hash or a path with that hash doesn't exist,
|
||||||
# download the file and add it to the store.
|
# download the file and add it to the store.
|
||||||
if test -z "$finalPath"; then
|
if test -z "$finalPath"; then
|
||||||
tmpPath="$(mktemp --tmpdir -d svn-checkout-tmp-XXXXXXXX)"
|
tmpPath="$(mktemp -d "${TMPDIR:-/tmp}/svn-checkout-tmp-XXXXXXXX")"
|
||||||
trap "rm -rf \"$tmpPath\"" EXIT
|
trap "rm -rf \"$tmpPath\"" EXIT
|
||||||
|
|
||||||
tmpFile="$tmpPath/$dstFile"
|
tmpFile="$tmpPath/$dstFile"
|
||||||
|
|
Loading…
Reference in a new issue