diff options
| author | zimbatm <zimbatm@zimbatm.com> | 2016-06-25 14:25:58 +0100 |
|---|---|---|
| committer | zimbatm <zimbatm@zimbatm.com> | 2016-06-25 14:25:58 +0100 |
| commit | 4f5918cd2e11082f33b3ce6a1bdcd5f70c68d3c2 (patch) | |
| tree | bb0b815513dc9a0b5562c9795d725557a845e9d0 /pkgs/stdenv/generic/setup.sh | |
| parent | 893ab31159486b260e0ede4ab876ea9cdf935fbc (diff) | |
| download | nixlib-4f5918cd2e11082f33b3ce6a1bdcd5f70c68d3c2.tar nixlib-4f5918cd2e11082f33b3ce6a1bdcd5f70c68d3c2.tar.gz nixlib-4f5918cd2e11082f33b3ce6a1bdcd5f70c68d3c2.tar.bz2 nixlib-4f5918cd2e11082f33b3ce6a1bdcd5f70c68d3c2.tar.lz nixlib-4f5918cd2e11082f33b3ce6a1bdcd5f70c68d3c2.tar.xz nixlib-4f5918cd2e11082f33b3ce6a1bdcd5f70c68d3c2.tar.zst nixlib-4f5918cd2e11082f33b3ce6a1bdcd5f70c68d3c2.zip | |
Revert "stdenv: introduce baseHash() to replace stripHash()"
Introduced by mistake This reverts commit e71a5cb87841f0af4a2279517b77a9a07ba394c0.
Diffstat (limited to 'pkgs/stdenv/generic/setup.sh')
| -rw-r--r-- | pkgs/stdenv/generic/setup.sh | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh index 88300db35bcd..85e74461d2a4 100644 --- a/pkgs/stdenv/generic/setup.sh +++ b/pkgs/stdenv/generic/setup.sh @@ -484,7 +484,8 @@ dumpVars() { } -# DEPRECATED, use baseHash - 2016-06-23 +# Utility function: return the base name of the given path, with the +# prefix `HASH-' removed, if present. stripHash() { strippedName=$(basename $1); if echo "$strippedName" | grep -q '^[a-z0-9]\{32\}-'; then @@ -492,14 +493,6 @@ stripHash() { fi } -# Print NAME with any leading directory components and hash removed. -# If specified, also remove a trailing SUFFIX. -# -# Usage: baseHash NAME [SUFFIX] -# Usage: baseName -a [-s SUFFIX] NAME... -baseHash() { - basename "$@" | sed -s 's/^[a-z0-9]\{32\}-//g' -} unpackCmdHooks+=(_defaultUnpack) _defaultUnpack() { |