diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2018-07-21 15:48:14 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-21 15:48:14 -0400 |
| commit | 37273afd27ea24f952e7725519b5e5def8c7827b (patch) | |
| tree | 2daaebbf95300e70f58815a2937c3d73fccadb13 /pkgs/stdenv/generic | |
| parent | 17a0c57e68e7ffdeb19774a74ee0927ab4e69e98 (diff) | |
| parent | 0de0ce58939932aee786679a86d08b5227732fab (diff) | |
| download | nixpkgs-37273afd27ea24f952e7725519b5e5def8c7827b.tar nixpkgs-37273afd27ea24f952e7725519b5e5def8c7827b.tar.gz nixpkgs-37273afd27ea24f952e7725519b5e5def8c7827b.tar.bz2 nixpkgs-37273afd27ea24f952e7725519b5e5def8c7827b.tar.lz nixpkgs-37273afd27ea24f952e7725519b5e5def8c7827b.tar.xz nixpkgs-37273afd27ea24f952e7725519b5e5def8c7827b.tar.zst nixpkgs-37273afd27ea24f952e7725519b5e5def8c7827b.zip | |
Merge pull request #43224 from volth/patch-179
[staging] substitute(): --subst-var was silently coercing to "" if the variable does not exist.
Diffstat (limited to 'pkgs/stdenv/generic')
| -rw-r--r-- | pkgs/stdenv/generic/setup.sh | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh index 26d28609d87..c5feffcea99 100644 --- a/pkgs/stdenv/generic/setup.sh +++ b/pkgs/stdenv/generic/setup.sh @@ -660,6 +660,10 @@ substituteStream() { echo "substituteStream(): ERROR: substitution variables must be valid Bash names, \"$varName\" isn't." >&2 return 1 fi + if [ -z ${!varName+x} ]; then + echo "substituteStream(): ERROR: variable \$$varName is unset" >&2 + return 1 + fi pattern="@$varName@" replacement="${!varName}" ;; |