diff options
author | zimbatm <zimbatm@zimbatm.com> | 2016-06-23 11:53:45 +0100 |
---|---|---|
committer | zimbatm <zimbatm@zimbatm.com> | 2016-06-25 14:20:56 +0100 |
commit | e71a5cb87841f0af4a2279517b77a9a07ba394c0 (patch) | |
tree | c233b5bc126f79effc16d5b9ac60bfa3f1c1ea64 /nixos/modules/services | |
parent | 7060eaf0bb98f3b4b6d10e7e55d20df9527866bf (diff) | |
download | nixlib-e71a5cb87841f0af4a2279517b77a9a07ba394c0.tar nixlib-e71a5cb87841f0af4a2279517b77a9a07ba394c0.tar.gz nixlib-e71a5cb87841f0af4a2279517b77a9a07ba394c0.tar.bz2 nixlib-e71a5cb87841f0af4a2279517b77a9a07ba394c0.tar.lz nixlib-e71a5cb87841f0af4a2279517b77a9a07ba394c0.tar.xz nixlib-e71a5cb87841f0af4a2279517b77a9a07ba394c0.tar.zst nixlib-e71a5cb87841f0af4a2279517b77a9a07ba394c0.zip |
stdenv: introduce baseHash() to replace stripHash()
stripHash uses a global variable to communicate it's computation results, but it's not necessary. You can just pipe to stdout in a subshell. A function mostly behaves like just another command. baseHash() also introduces a suffix-stripping capability since it's something the users of the function tend to use.
Diffstat (limited to 'nixos/modules/services')
-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..489aa1ca9fbe 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/$(baseHash $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/$(baseHash $i | sed 's/\.in//') doSub $i $dst fi done |