Merge pull request #2635 from MikeMcQuaid/no-set-blank-vars

bin/brew: don't set blank HOMEBREW_* variables.
This commit is contained in:
Mike McQuaid 2017-05-14 20:38:48 +01:00 committed by GitHub
commit 1e6cf8f270

View File

@ -49,7 +49,11 @@ HOMEBREW_LIBRARY="$HOMEBREW_REPOSITORY/Library"
for VAR in AWS_ACCESS_KEY_ID AWS_SECRET_ACCESS_KEY BINTRAY_USER BINTRAY_KEY \ for VAR in AWS_ACCESS_KEY_ID AWS_SECRET_ACCESS_KEY BINTRAY_USER BINTRAY_KEY \
BROWSER EDITOR GIT PATH VISUAL BROWSER EDITOR GIT PATH VISUAL
do do
# Skip if variable value is empty.
[[ -z "${!VAR}" ]] && continue
VAR_NEW="HOMEBREW_${VAR}" VAR_NEW="HOMEBREW_${VAR}"
# Skip if existing HOMEBREW_* variable is set.
[[ -n "${!VAR_NEW}" ]] && continue [[ -n "${!VAR_NEW}" ]] && continue
export "$VAR_NEW"="${!VAR}" export "$VAR_NEW"="${!VAR}"
done done