diff options
| author | Doug Hazell | 2016-12-30 19:46:29 +0000 |
|---|---|---|
| committer | Doug Hazell | 2017-01-16 21:47:58 +0000 |
| commit | 90b3f9b19a066b14cfa1d67923ca5932db27e414 (patch) | |
| tree | df6b8e046b7b7005e9d891c9a02a340797c582c1 /Library | |
| parent | eca3f117badb9ee91d74d7978aa5f4d49a1e9bfd (diff) | |
| download | brew-90b3f9b19a066b14cfa1d67923ca5932db27e414.tar.bz2 | |
fixup
Diffstat (limited to 'Library')
| -rw-r--r-- | Library/Homebrew/brew.sh | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/Library/Homebrew/brew.sh b/Library/Homebrew/brew.sh index 92953001d..14de02065 100644 --- a/Library/Homebrew/brew.sh +++ b/Library/Homebrew/brew.sh @@ -76,7 +76,11 @@ 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 + +if [[ -z "$HOMEBREW_WHICH_RUBY" ]] +then + unset GEM_PATH +fi # Users may have this set, injecting arbitrary environment changes into # bash processes inside builds @@ -267,6 +271,12 @@ access to all bottles." EOS fi +if [[ -z "$HOMEBREW_ENV_PRUNED" ]] +then + source "$HOMEBREW_LIBRARY/Homebrew/utils/shell_env.sh" + prune-shell-env +fi + # Hide shellcheck complaint: # shellcheck source=/dev/null source "$HOMEBREW_LIBRARY/Homebrew/utils/analytics.sh" @@ -336,7 +346,12 @@ else # shellcheck source=/dev/null source "$HOMEBREW_LIBRARY/Homebrew/utils/ruby.sh" setup-ruby-path - + + if [[ -n "$HOMEBREW_WHICH_RUBY" ]] + then + export HOMEBREW_RUBY_PATH="$(which ruby)" + fi + # 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" "$@"; } |