diff options
| author | Mike McQuaid | 2017-09-29 20:39:59 +0100 |
|---|---|---|
| committer | GitHub | 2017-09-29 20:39:59 +0100 |
| commit | ffb582b5a6d829c5825e6d6a40545cb3099001fb (patch) | |
| tree | 4085bafa02b3e724dec427b61627a7f88ef0104f /Library | |
| parent | 3883382a508fb284dc2a3d226700209a506ec430 (diff) | |
| parent | bcca2a7c6b80a6450bd8261af987a8da260b6b89 (diff) | |
| download | brew-ffb582b5a6d829c5825e6d6a40545cb3099001fb.tar.bz2 | |
Merge pull request #3240 from MikeMcQuaid/update-handle-ruby-changes
brew: handle Ruby 2.3 more gracefully.
Diffstat (limited to 'Library')
| -rw-r--r-- | Library/Homebrew/brew.rb | 8 | ||||
| -rw-r--r-- | Library/Homebrew/cmd/update.sh | 1 | ||||
| -rw-r--r-- | Library/Homebrew/dev-cmd/update-test.rb | 2 |
3 files changed, 8 insertions, 3 deletions
diff --git a/Library/Homebrew/brew.rb b/Library/Homebrew/brew.rb index 2906fd93d..41955e60e 100644 --- a/Library/Homebrew/brew.rb +++ b/Library/Homebrew/brew.rb @@ -5,8 +5,12 @@ end std_trap = trap("INT") { exit! 130 } # no backtrace thanks # check ruby version before requiring any modules. -RUBY_TWO = RUBY_VERSION.split(".").first.to_i >= 2 -raise "Homebrew must be run under Ruby 2!" unless RUBY_TWO +RUBY_VERSION_SPLIT = RUBY_VERSION.split "." +RUBY_X = RUBY_VERSION_SPLIT[0].to_i +RUBY_Y = RUBY_VERSION_SPLIT[1].to_i +if RUBY_X < 2 || (RUBY_X == 2 && RUBY_Y < 3) + raise "Homebrew must be run under Ruby 2.3!" +end require "pathname" HOMEBREW_LIBRARY_PATH = Pathname.new(__FILE__).realpath.parent diff --git a/Library/Homebrew/cmd/update.sh b/Library/Homebrew/cmd/update.sh index e8211e4dd..3507fa92b 100644 --- a/Library/Homebrew/cmd/update.sh +++ b/Library/Homebrew/cmd/update.sh @@ -570,6 +570,7 @@ EOS -d "$HOMEBREW_LIBRARY/LinkedKegs" || (-n "$HOMEBREW_DEVELOPER" && -z "$HOMEBREW_UPDATE_PREINSTALL") ]] then + unset HOMEBREW_RUBY_PATH brew update-report "$@" return $? elif [[ -z "$HOMEBREW_UPDATE_PREINSTALL" ]] diff --git a/Library/Homebrew/dev-cmd/update-test.rb b/Library/Homebrew/dev-cmd/update-test.rb index aa7fe6a92..a66704917 100644 --- a/Library/Homebrew/dev-cmd/update-test.rb +++ b/Library/Homebrew/dev-cmd/update-test.rb @@ -81,7 +81,7 @@ module Homebrew safe_system "git", "reset", "--hard", start_commit # update ENV["PATH"] - ENV["PATH"] = "#{curdir}/bin:/usr/local/bin:/usr/bin:/bin" + ENV["PATH"] = "#{curdir}/bin:#{ENV["PATH"]}" # run brew update oh1 "Running brew update..." |