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

Merge pull request #13309 from SMillerDev/feature/rb2.7

Browse Source
This commit is contained in:
Sean Molenaar 2022-07-06 18:23:51 +02:00 committed by GitHub
commit e8f145441b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Library/Homebrew/utils/ruby.sh
View File

@ -17,7 +17,7 @@ test_ruby() {
# HOMEBREW_PATH is set by global.rb # HOMEBREW_PATH is set by global.rb
# shellcheck disable=SC2154 # shellcheck disable=SC2154
find_ruby() { find_ruby() {
if [[ -n "${HOMEBREW_MACOS}" ]] if [[ -n "${HOMEBREW_MACOS}" && -z "${HOMEBREW_USE_RUBY_FROM_PATH}" ]]
then then
echo "/System/Library/Frameworks/Ruby.framework/Versions/Current/usr/bin/ruby" echo "/System/Library/Frameworks/Ruby.framework/Versions/Current/usr/bin/ruby"
else else

8
Library/Homebrew/utils/ruby_check_version_script.rb
View File

@ -17,7 +17,11 @@ ruby_version_major, ruby_version_minor, = ruby_version.canonical_segments
homebrew_required_ruby_version_major, homebrew_required_ruby_version_minor, = homebrew_required_ruby_version_major, homebrew_required_ruby_version_minor, =
homebrew_required_ruby_version.canonical_segments homebrew_required_ruby_version.canonical_segments
if ruby_version_major != homebrew_required_ruby_version_major || if ENV["HOMEBREW_DEVELOPER"].present? &&
ruby_version_minor != homebrew_required_ruby_version_minor ENV["HOMEBREW_USE_RUBY_FROM_PATH"].present? &&
ruby_version >= homebrew_required_ruby_version
return
elsif ruby_version_major != homebrew_required_ruby_version_major ||
ruby_version_minor != homebrew_required_ruby_version_minor
abort abort
end end