From e78b31905df68309af65347a4ed2338f87942854 Mon Sep 17 00:00:00 2001 From: Doug Hazell Date: Tue, 3 Jan 2017 22:23:10 +0000 Subject: [PATCH] fixup --- Library/Homebrew/brew.sh | 24 ------------------------ 1 file changed, 24 deletions(-) diff --git a/Library/Homebrew/brew.sh b/Library/Homebrew/brew.sh index 14de020659..e93d3de75f 100644 --- a/Library/Homebrew/brew.sh +++ b/Library/Homebrew/brew.sh @@ -73,19 +73,6 @@ 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 - -if [[ -z "$HOMEBREW_WHICH_RUBY" ]] -then - unset GEM_PATH -fi - -# Users may have this set, injecting arbitrary environment changes into -# bash processes inside builds -unset BASH_ENV - HOMEBREW_SYSTEM="$(uname -s)" case "$HOMEBREW_SYSTEM" in Darwin) HOMEBREW_MACOS="1" ;; @@ -271,12 +258,6 @@ 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" @@ -347,11 +328,6 @@ else 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" "$@"; }