public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

stdenv stripHash(): fixup after #19324

Browse Source
This commit is contained in:
Vladimír Čunát 2016-10-12 22:29:38 +02:00
parent e228c804ad
commit af38c05587
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/stdenv/generic/setup.sh
View File

@ -490,12 +490,14 @@ dumpVars() {
} }
# Utility function: return the base name of the given path, with the # Utility function: echo the base name of the given path, with the
# prefix `HASH-' removed, if present. # prefix `HASH-' removed, if present.
stripHash() { stripHash() {
strippedName=$(basename $1); local strippedName="$(basename "$1")";
if echo "$strippedName" | grep -q '^[a-z0-9]\{32\}-'; then if echo "$strippedName" | grep -q '^[a-z0-9]\{32\}-'; then
echo "$strippedName" | cut -c34- echo "$strippedName" | cut -c34-
else
echo "$strippedName"
fi fi
} }
@ -506,12 +508,10 @@ _defaultUnpack() {
if [ -d "$fn" ]; then if [ -d "$fn" ]; then
stripHash "$fn"
# We can't preserve hardlinks because they may have been # We can't preserve hardlinks because they may have been
# introduced by store optimization, which might break things # introduced by store optimization, which might break things
# in the build. # in the build.
cp -pr --reflink=auto "$fn" $strippedName cp -pr --reflink=auto "$fn" "$(stripHash "$fn")"
else else