admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

Update from comments

Browse Source
This commit is contained in:
Doug Hazell 2017-02-23 15:21:46 +00:00
parent 5d1576784a
commit ac4c9d1324
1 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
bin/brew
View File

@ -46,22 +46,25 @@ HOMEBREW_LIBRARY="$HOMEBREW_REPOSITORY/Library"
if [[ -n "$HOMEBREW_ENV_FILTERING" ]] if [[ -n "$HOMEBREW_ENV_FILTERING" ]]
then then
PATH="/usr/bin:/bin:/usr/sbin:/sbin"
homebrew_vars=$("$HOMEBREW_LIBRARY/Homebrew/utils/homebrew_vars.rb") export HOMEBREW_BREW_FILE
export HOMEBREW_PREFIX
export HOMEBREW_REPOSITORY
export HOMEBREW_LIBRARY
cmd_str="/usr/bin/env -i \ execution_env=()
HOME=$HOME \ for key in HOME SHELL PATH TERM LOGNAME USER "${!HOMEBREW_@}"
PATH=/usr/bin:/bin:/usr/sbin:/sbin \ do
TERM=$TERM \ # ugly, unfortunate consequence of lack of `export -p NAME` in bash's export
HOMEBREW_BREW_FILE=$HOMEBREW_BREW_FILE \
HOMEBREW_PREFIX=$HOMEBREW_PREFIX \
HOMEBREW_REPOSITORY=$HOMEBREW_REPOSITORY \
HOMEBREW_LIBRARY=$HOMEBREW_LIBRARY \
$homebrew_vars \
/bin/bash $HOMEBREW_LIBRARY/Homebrew/brew.sh $@"
command $cmd_str # The following failed to find non exported vars on Bash 3.2.48
[[ "$(declare -p "$key" 2>/dev/null)" =~ ^declare\ -[^\ ]*x[^\ ]*\ ]] || continue
execution_env+=( "${key}=${!key}" )
done
/usr/bin/env -i "${execution_env[@]}" /bin/bash "$HOMEBREW_LIBRARY/Homebrew/brew.sh" "$@"
else else
source "$HOMEBREW_LIBRARY/Homebrew/brew.sh" source "$HOMEBREW_LIBRARY/Homebrew/brew.sh"
fi fi