mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-23 07:26:54 +00:00
5e7a1cf955
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>
83 lines
1.9 KiB
Bash
Executable file
83 lines
1.9 KiB
Bash
Executable file
#! /bin/sh -e
|
|
|
|
cvsRoot=$1
|
|
module=$2
|
|
tag=$3
|
|
expHash=$4
|
|
|
|
hashType=$NIX_HASH_ALGO
|
|
if test -z "$hashType"; then
|
|
hashType=sha256
|
|
fi
|
|
|
|
if test -z "$cvsRoot"; then
|
|
echo "syntax: nix-prefetch-cvs CVSROOT MODULE [TAG [HASH]]" >&2
|
|
exit 1
|
|
elif test -z "$module"; then
|
|
echo "syntax: nix-prefetch-cvs CVSROOT MODULE [TAG [HASH]]" >&2
|
|
exit 1
|
|
fi
|
|
|
|
|
|
mkTempDir() {
|
|
tmpPath="$(mktemp -d "${TMPDIR:-/tmp}/nix-prefetch-cvs-XXXXXXXX")"
|
|
trap removeTempDir EXIT SIGINT SIGQUIT
|
|
}
|
|
|
|
removeTempDir() {
|
|
if test -n "$tmpPath"; then
|
|
rm -rf "$tmpPath" || true
|
|
fi
|
|
}
|
|
|
|
|
|
# If the hash was given, a file with that hash may already be in the
|
|
# store.
|
|
if test -n "$expHash"; then
|
|
finalPath=$(nix-store --print-fixed-path --recursive "$hashType" "$expHash" cvs-export)
|
|
if ! nix-store --check-validity "$finalPath" 2> /dev/null; then
|
|
finalPath=
|
|
fi
|
|
hash=$expHash
|
|
fi
|
|
|
|
|
|
# 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.
|
|
if test -z "$finalPath"; then
|
|
|
|
mkTempDir
|
|
tmpFile=$tmpPath/cvs-export
|
|
#mkdir $tmpPath
|
|
|
|
# Perform the checkout.
|
|
if test -z "$tag"; then
|
|
args=(-D "now")
|
|
elif test "$USE_DATE" = "1"; then
|
|
args=(-D "$tag")
|
|
else
|
|
args=(-r "$tag")
|
|
fi
|
|
(cd "$tmpPath" && cvs -f -z0 -d $cvsRoot export "${args[*]}" -d cvs-export $module >&2)
|
|
|
|
# Compute the hash.
|
|
hash=$(nix-hash --type $hashType $hashFormat $tmpFile)
|
|
if ! test -n "$QUIET"; then echo "hash is $hash" >&2; fi
|
|
|
|
# Add the downloaded file to the Nix store.
|
|
finalPath=$(nix-store --add-fixed --recursive "$hashType" $tmpFile)
|
|
|
|
if test -n "$expHash" -a "$expHash" != "$hash"; then
|
|
echo "hash mismatch for CVS root \`$cvsRoot'"
|
|
exit 1
|
|
fi
|
|
fi
|
|
|
|
if ! test -n "$QUIET"; then echo "path is $finalPath" >&2; fi
|
|
|
|
echo $hash
|
|
|
|
if test -n "$PRINT_PATH"; then
|
|
echo $finalPath
|
|
fi
|