diff options
| author | Profpatsch <mail@profpatsch.de> | 2016-10-11 18:09:56 +0200 |
|---|---|---|
| committer | Franz Pletz <fpletz@fnordicwalking.de> | 2016-10-11 18:34:36 +0200 |
| commit | bef6bef0d2ce2ef7cfaa3e9f1eac2cdc793560c4 (patch) | |
| tree | 6f7439b3f02e47ed1960a0b4d62ee4c01ef6d7af /nixos/modules/services/networking/ircd-hybrid | |
| parent | 8417c3aae100c1a46e423804a2f6a85a82816685 (diff) | |
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 'nixos/modules/services/networking/ircd-hybrid')
| -rw-r--r-- | nixos/modules/services/networking/ircd-hybrid/builder.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nixos/modules/services/networking/ircd-hybrid/builder.sh b/nixos/modules/services/networking/ircd-hybrid/builder.sh index f2c92878a4dc..38312210df25 100644 --- a/nixos/modules/services/networking/ircd-hybrid/builder.sh +++ b/nixos/modules/services/networking/ircd-hybrid/builder.sh @@ -12,7 +12,7 @@ for i in $scripts; do if test "$(echo $i | cut -c1-2)" = "=>"; then subDir=$(echo $i | cut -c3-) else - dst=$out/$subDir/$((stripHash $i; echo $strippedName) | sed 's/\.in//') + dst=$out/$subDir/$(stripHash $i | sed 's/\.in//') doSub $i $dst chmod +x $dst # !!! fi @@ -23,7 +23,7 @@ for i in $substFiles; do if test "$(echo $i | cut -c1-2)" = "=>"; then subDir=$(echo $i | cut -c3-) else - dst=$out/$subDir/$((stripHash $i; echo $strippedName) | sed 's/\.in//') + dst=$out/$subDir/$(stripHash $i | sed 's/\.in//') doSub $i $dst fi done |