about summary refs log tree commit diff
path: root/pkgs/stdenv/generic/setup.sh
diff options
context:
space:
mode:
authorProfpatsch <mail@profpatsch.de>2016-10-11 18:09:56 +0200
committerFranz Pletz <fpletz@fnordicwalking.de>2016-10-11 18:34:36 +0200
commitbef6bef0d2ce2ef7cfaa3e9f1eac2cdc793560c4 (patch)
tree6f7439b3f02e47ed1960a0b4d62ee4c01ef6d7af /pkgs/stdenv/generic/setup.sh
parent8417c3aae100c1a46e423804a2f6a85a82816685 (diff)
downloadnixlib-bef6bef0d2ce2ef7cfaa3e9f1eac2cdc793560c4.tar
nixlib-bef6bef0d2ce2ef7cfaa3e9f1eac2cdc793560c4.tar.gz
nixlib-bef6bef0d2ce2ef7cfaa3e9f1eac2cdc793560c4.tar.bz2
nixlib-bef6bef0d2ce2ef7cfaa3e9f1eac2cdc793560c4.tar.lz
nixlib-bef6bef0d2ce2ef7cfaa3e9f1eac2cdc793560c4.tar.xz
nixlib-bef6bef0d2ce2ef7cfaa3e9f1eac2cdc793560c4.tar.zst
nixlib-bef6bef0d2ce2ef7cfaa3e9f1eac2cdc793560c4.zip
stdenv/stripHash: print to stdout, not to variable
`stripHash` documentation states that it prints out the stripped name to
the stdout, but the function stored the value in `strippedName`
instead.

Basically all usages did something like
`$(stripHash $foo | echo $strippedName)` which is just braindamaged.
Fixed the implementation and all invocations.
Diffstat (limited to 'pkgs/stdenv/generic/setup.sh')
-rw-r--r--pkgs/stdenv/generic/setup.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh
index feb82fd92266..15238a44598d 100644
--- a/pkgs/stdenv/generic/setup.sh
+++ b/pkgs/stdenv/generic/setup.sh
@@ -495,7 +495,7 @@ dumpVars() {
 stripHash() {
     strippedName=$(basename $1);
     if echo "$strippedName" | grep -q '^[a-z0-9]\{32\}-'; then
-        strippedName=$(echo "$strippedName" | cut -c34-)
+        echo "$strippedName" | cut -c34-
     fi
 }