diff options
| author | Mike McQuaid | 2018-01-26 22:21:43 +0000 |
|---|---|---|
| committer | GitHub | 2018-01-26 22:21:43 +0000 |
| commit | ede3d91f0ab2b9c1ae8cc86fff45d25e4f9f6e6d (patch) | |
| tree | 8faa18585620ae50b9f53d5701253e36a6861bb0 /Library/Homebrew/utils.rb | |
| parent | 65e940f833ef90b9111055f8772f601ad3b53b8c (diff) | |
| parent | 4abae7f7e964ae2c1cb8ba83f0ac4ebae687c2c1 (diff) | |
| download | brew-ede3d91f0ab2b9c1ae8cc86fff45d25e4f9f6e6d.tar.bz2 | |
Merge pull request #3736 from MikeMcQuaid/travis-config-tweaks
.travis.yml: make configuration tweaks.
Diffstat (limited to 'Library/Homebrew/utils.rb')
| -rw-r--r-- | Library/Homebrew/utils.rb | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/Library/Homebrew/utils.rb b/Library/Homebrew/utils.rb index 773efd2f4..77eae6f69 100644 --- a/Library/Homebrew/utils.rb +++ b/Library/Homebrew/utils.rb @@ -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 |