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

Reverting 'brew.sh' to origin/master to resolve conflict

Browse Source
This commit is contained in:
Doug Hazell 2017-02-12 15:26:59 +00:00
parent 0bb0228962
commit adc43466a6
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Library/Homebrew/brew.sh
View File

@ -73,6 +73,18 @@ fi
export GEM_OLD_HOME="$GEM_HOME"
export GEM_OLD_PATH="$GEM_PATH"
# Users may have these set, pointing the system Ruby
# at non-system gem paths
unset GEM_HOME
unset GEM_PATH
# Users may have this set, injecting arbitrary environment changes into
# bash processes inside builds
unset BASH_ENV
# Users may have this set, breaking grep's output.
unset GREP_OPTIONS
HOMEBREW_SYSTEM="$(uname -s)"
case "$HOMEBREW_SYSTEM" in
Darwin) HOMEBREW_MACOS="1" ;;
@ -327,7 +339,7 @@ else
# shellcheck source=/dev/null
source "$HOMEBREW_LIBRARY/Homebrew/utils/ruby.sh"
setup-ruby-path
# Unshift command back into argument list (unless argument list was empty).
[[ "$HOMEBREW_ARG_COUNT" -gt 0 ]] && set -- "$HOMEBREW_COMMAND" "$@"
{ update-preinstall; exec "$HOMEBREW_RUBY_PATH" -W0 "$HOMEBREW_LIBRARY/Homebrew/brew.rb" "$@"; }