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

substitute(): --subst-var was silently coercing to "" if the variable does not exist.

Browse Source
This commit is contained in:
volth 2018-07-08 15:59:57 +00:00
parent 4bd4e3ef5c
commit 0de0ce5893
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -661,6 +661,10 @@ substituteStream() {
echo "substituteStream(): ERROR: substitution variables must be valid Bash names, \"$varName\" isn't." >&2 echo "substituteStream(): ERROR: substitution variables must be valid Bash names, \"$varName\" isn't." >&2
return 1 return 1
fi fi
if [ -z ${!varName+x} ]; then
echo "substituteStream(): ERROR: variable \$$varName is unset" >&2
return 1
fi
pattern="@$varName@" pattern="@$varName@"
replacement="${!varName}" replacement="${!varName}"
;; ;;