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

Merge pull request #3240 from MikeMcQuaid/update-handle-ruby-changes

Browse Source 
brew: handle Ruby 2.3 more gracefully.
This commit is contained in:
Mike McQuaid 2017-09-29 20:39:59 +01:00 committed by GitHub
commit ffb582b5a6
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Library/Homebrew/brew.rb
View File

@ -5,8 +5,12 @@ end
std_trap = trap("INT") { exit! 130 } # no backtrace thanks std_trap = trap("INT") { exit! 130 } # no backtrace thanks
# check ruby version before requiring any modules. # check ruby version before requiring any modules.
RUBY_TWO = RUBY_VERSION.split(".").first.to_i >= 2 RUBY_VERSION_SPLIT = RUBY_VERSION.split "."
raise "Homebrew must be run under Ruby 2!" unless RUBY_TWO 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" require "pathname"
HOMEBREW_LIBRARY_PATH = Pathname.new(__FILE__).realpath.parent HOMEBREW_LIBRARY_PATH = Pathname.new(__FILE__).realpath.parent

1
Library/Homebrew/cmd/update.sh
View File

@ -570,6 +570,7 @@ EOS
-d "$HOMEBREW_LIBRARY/LinkedKegs" || -d "$HOMEBREW_LIBRARY/LinkedKegs" ||
(-n "$HOMEBREW_DEVELOPER" && -z "$HOMEBREW_UPDATE_PREINSTALL") ]] (-n "$HOMEBREW_DEVELOPER" && -z "$HOMEBREW_UPDATE_PREINSTALL") ]]
then then
unset HOMEBREW_RUBY_PATH
brew update-report "$@" brew update-report "$@"
return $? return $?
elif [[ -z "$HOMEBREW_UPDATE_PREINSTALL" ]] elif [[ -z "$HOMEBREW_UPDATE_PREINSTALL" ]]

2
Library/Homebrew/dev-cmd/update-test.rb
View File

@ -81,7 +81,7 @@ module Homebrew
safe_system "git", "reset", "--hard", start_commit safe_system "git", "reset", "--hard", start_commit
# update ENV["PATH"] # update ENV["PATH"]
ENV["PATH"] = "#{curdir}/bin:/usr/local/bin:/usr/bin:/bin" ENV["PATH"] = "#{curdir}/bin:#{ENV["PATH"]}"
# run brew update # run brew update
oh1 "Running brew update..." oh1 "Running brew update..."