alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

stdenv-setup: fix substituteAll with set -eu

Browse source 
Environment variable filter in substituteAll was not precise and produced
undefined and invalid variable names.  Vladimír Čunát tried to fix that in [1],
but `env -0` did not work during Darwin bootstrap, so [2] reverted this change
and replaced an error due to invalid variables with a warning.  Recently in #28057
John Ericson added `set -u` to `setup.sh` and undefined variables made the setup
fail during e.g. `nix-build -A gnat` with `setup: line 519: !varName: unbound
variable`.

[1] 62fc8859c1
[2] 81df035429
This commit is contained in:
Orivej Desh 2017-08-31 14:20:51 +00:00
parent 447240b19f
commit a09d9e7cd4
1 changed files with 17 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
pkgs/stdenv/generic/setup.sh
View file

@ -473,14 +473,14 @@ substitute() {
shift 2 shift 2
if [ ! -f "$input" ]; then if [ ! -f "$input" ]; then
echo "${FUNCNAME[0]}(): ERROR: file '$input' does not exist" >&2 echo "substitute(): ERROR: file '$input' does not exist" >&2
return 1 return 1
fi fi
local content local content
# read returns non-0 on EOF, so we want read to fail # read returns non-0 on EOF, so we want read to fail
if IFS='' read -r -N 0 content < "$input"; then if IFS='' read -r -N 0 content < "$input"; then
echo "${FUNCNAME[0]}(): ERROR: File \"$input\" has null bytes, won't process" >&2 echo "substitute(): ERROR: File \"$input\" has null bytes, won't process" >&2
return 1 return 1
fi fi
@ -497,10 +497,8 @@ substitute() {
shift 2 shift 2
# check if the used nix attribute name is a valid bash name # check if the used nix attribute name is a valid bash name
if ! [[ "$varName" =~ ^[a-zA-Z_][a-zA-Z0-9_]*$ ]]; then if ! [[ "$varName" =~ ^[a-zA-Z_][a-zA-Z0-9_]*$ ]]; then
echo "${FUNCNAME[0]}(): WARNING: substitution variables should be valid bash names," >&2 echo "substitute(): ERROR: substitution variables must be valid Bash names, \"$varName\" isn't." >&2
echo " \"$varName\" isn't and therefore was skipped; it might be caused" >&2 return 1
echo " by multi-line phases in variables - see #14907 for details." >&2
continue
fi fi
pattern="@$varName@" pattern="@$varName@"
replacement="${!varName}" replacement="${!varName}"
@ -513,7 +511,7 @@ substitute() {
;; ;;
*) *)
echo "${FUNCNAME[0]}(): ERROR: Invalid command line argument: $1" >&2 echo "substitute(): ERROR: Invalid command line argument: $1" >&2
return 1 return 1
;; ;;
esac esac
@ -532,17 +530,24 @@ substituteInPlace() {
substitute "$fileName" "$fileName" "$@" substitute "$fileName" "$fileName" "$@"
} }
# List the names of the environment variables that are valid Bash names.
listVars() {
# "export" prints "declare -x name=value", quoted for eval.
declare() {
echo "${2%%=*}"
}
eval "$(export)"
unset declare
}
# Substitute all environment variables that do not start with an upper-case # Substitute all environment variables that start with a lowercase character and
# character or underscore. Note: other names that aren't bash-valid # are valid Bash names.
# will cause an error during `substitute --subst-var`.
substituteAll() { substituteAll() {
local input="$1" local input="$1"
local output="$2" local output="$2"
local -a args=() local -a args=()
# Select all environment variables that start with a lowercase character. for varName in $(listVars | grep '^[a-z]'); do
for varName in $(env | sed -e $'s/^\([a-z][^= \t]*\)=.*/\\1/; t \n d'); do
if [ "${NIX_DEBUG:-}" = "1" ]; then if [ "${NIX_DEBUG:-}" = "1" ]; then
echo "@${varName}@ -> '${!varName}'" echo "@${varName}@ -> '${!varName}'"
fi fi