diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-11-16 22:18:08 +0100 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-11-16 22:18:08 +0100 |
| commit | 5a0b79f955d6c2dc21239f1b0d956ef8dc89a57e (patch) | |
| tree | 6d28cafbf2c7f966eeec21b67f446ce4f34e2a33 /pkgs/stdenv/generic | |
| parent | a0f3faf34e6b2f024ef86d84ad80c124c33b941a (diff) | |
| parent | 1455ecee734d537766ee61515c77582a9ebd5309 (diff) | |
| download | nixlib-5a0b79f955d6c2dc21239f1b0d956ef8dc89a57e.tar nixlib-5a0b79f955d6c2dc21239f1b0d956ef8dc89a57e.tar.gz nixlib-5a0b79f955d6c2dc21239f1b0d956ef8dc89a57e.tar.bz2 nixlib-5a0b79f955d6c2dc21239f1b0d956ef8dc89a57e.tar.lz nixlib-5a0b79f955d6c2dc21239f1b0d956ef8dc89a57e.tar.xz nixlib-5a0b79f955d6c2dc21239f1b0d956ef8dc89a57e.tar.zst nixlib-5a0b79f955d6c2dc21239f1b0d956ef8dc89a57e.zip | |
Merge remote-tracking branch 'origin/bash-4.3' into staging
Diffstat (limited to 'pkgs/stdenv/generic')
| -rw-r--r-- | pkgs/stdenv/generic/setup.sh | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh index 904cc13e06c7..1cc60ebf02bc 100644 --- a/pkgs/stdenv/generic/setup.sh +++ b/pkgs/stdenv/generic/setup.sh @@ -176,10 +176,11 @@ fi # Check that the pre-hook initialised SHELL. if [ -z "$SHELL" ]; then echo "SHELL not set"; exit 1; fi +BASH="$SHELL" +export CONFIG_SHELL="$SHELL" # Execute the pre-hook. -export CONFIG_SHELL="$SHELL" if [ -z "$shell" ]; then export shell=$SHELL; fi runHook preHook @@ -387,7 +388,7 @@ substituteAll() { local output="$2" # Select all environment variables that start with a lowercase character. - for envVar in $(env | sed "s/^[^a-z].*//" | sed "s/^\([^=]*\)=.*/\1/"); do + for envVar in $(env | sed -e $'s/^\([a-z][^=]*\)=.*/\\1/; t \n d'); do if [ "$NIX_DEBUG" = "1" ]; then echo "$envVar -> ${!envVar}" fi |