diff options
| author | Mike McQuaid | 2017-09-21 15:32:41 +0100 |
|---|---|---|
| committer | GitHub | 2017-09-21 15:32:41 +0100 |
| commit | 7d720e8fac6975aa402bf69361507982fbfc49ff (patch) | |
| tree | 683939de850213febf70969ab21e2daa6e2c648a /Library/Homebrew/utils | |
| parent | 05bb3532fc3f0d723a8e8af1605c3f8080051e78 (diff) | |
| parent | b2b413165f3553c48c8e060dd97ccde9c13cae80 (diff) | |
| download | brew-7d720e8fac6975aa402bf69361507982fbfc49ff.tar.bz2 | |
Merge pull request #3164 from MikeMcQuaid/portable-ruby-2.3.3
Upgrade vendored Ruby to 2.3.3.
Diffstat (limited to 'Library/Homebrew/utils')
| -rw-r--r-- | Library/Homebrew/utils/ruby.sh | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/Library/Homebrew/utils/ruby.sh b/Library/Homebrew/utils/ruby.sh index 6945c068b..0303da600 100644 --- a/Library/Homebrew/utils/ruby.sh +++ b/Library/Homebrew/utils/ruby.sh @@ -2,7 +2,8 @@ setup-ruby-path() { local vendor_dir local vendor_ruby_current_version local vendor_ruby_path - local ruby_version_major + local ruby_old_version + local minimum_ruby_version="2.3.3" vendor_dir="$HOMEBREW_LIBRARY/Homebrew/vendor" vendor_ruby_current_version="$vendor_dir/portable-ruby/current" @@ -36,12 +37,10 @@ setup-ruby-path() { if [[ -n "$HOMEBREW_RUBY_PATH" ]] then - ruby_version_major="$("$HOMEBREW_RUBY_PATH" --version)" - ruby_version_major="${ruby_version_major#ruby }" - ruby_version_major="${ruby_version_major%%.*}" + ruby_old_version="$("$HOMEBREW_RUBY_PATH" -e "puts Gem::Version.new('$minimum_ruby_version') > Gem::Version.new(RUBY_VERSION)")" fi - if [[ "$ruby_version_major" != "2" || -n "$HOMEBREW_FORCE_VENDOR_RUBY" ]] + if [[ "$ruby_old_version" == "true" || -n "$HOMEBREW_FORCE_VENDOR_RUBY" ]] then brew vendor-install ruby --quiet if [[ ! -x "$vendor_ruby_path" ]] |