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

Always install Gems into bundler location.

Browse Source
This commit is contained in:
Mike McQuaid 2018-01-26 22:05:43 +00:00
parent d1d4a667d1
commit 4abae7f7e9
2 changed files with 2 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Library/Homebrew/brew.sh
View File

@ -69,16 +69,6 @@ then
odie "Cowardly refusing to continue at this prefix: $HOMEBREW_PREFIX"
fi
# Save values to use for installing gems
if [[ -n "$GEM_HOME" ]]
then
export HOMEBREW_GEM_HOME="$GEM_HOME"
fi
if [[ -n "$GEM_PATH" ]]
then
export HOMEBREW_GEM_PATH="$GEM_PATH"
fi
HOMEBREW_SYSTEM="$(uname -s)"
case "$HOMEBREW_SYSTEM" in
Darwin) HOMEBREW_MACOS="1" ;;

11
Library/Homebrew/utils.rb
View File

@ -196,15 +196,8 @@ module Homebrew
end
def install_gem_setup_path!(name, version = nil, executable = name)
# Respect user's preferences for where gems should be installed.
ENV["GEM_HOME"] = if ENV["HOMEBREW_GEM_HOME"].to_s.empty?
Gem.user_dir
else
ENV["HOMEBREW_GEM_HOME"]
end
unless ENV["HOMEBREW_GEM_PATH"].to_s.empty?
ENV["GEM_PATH"] = ENV["HOMEBREW_GEM_PATH"]
end
# Match where our bundler gems are.
ENV["GEM_HOME"] = "#{ENV["HOMEBREW_LIBRARY"]}/Homebrew/vendor/bundle/ruby/#{RbConfig::CONFIG["ruby_version"]}"
# Make rubygems notice env changes.
Gem.clear_paths