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

setup.sh: rewrite stripHash

Browse Source 
Rewrite the `stripHash` helper function with 2 differences:

* Paths starting with `--` will no longer produce an error.
* Use Bash string manipulation instead of shelling out to `grep` and
  `cut`. This should be faster.
This commit is contained in:
Lily Ballard 2019-08-05 21:27:21 -07:00 committed by Frederik Rietdijk
parent d688c7cd05
commit d45d6205de
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -787,14 +787,17 @@ dumpVars() {
# Utility function: echo 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() {
local strippedName local strippedName casematchOpt=0
# On separate line for `set -e` # On separate line for `set -e`
strippedName="$(basename "$1")" strippedName="$(basename -- "$1")"
if echo "$strippedName" | grep -q '^[a-z0-9]\{32\}-'; then shopt -q nocasematch && casematchOpt=1
echo "$strippedName" | cut -c34- shopt -u nocasematch
if [[ "$strippedName" =~ ^[a-z0-9]{32}- ]]; then
echo "${strippedName:33}"
else else
echo "$strippedName" echo "$strippedName"
fi fi
if (( casematchOpt )); then shopt -s nocasematch; fi
} }