From 93ed7646b0b40ebe40ffda6b54af19e5d6eda25d Mon Sep 17 00:00:00 2001 From: Sean Molenaar Date: Sun, 22 May 2022 15:22:37 +0200 Subject: [PATCH] utils: allow developers to differ in ruby minor versions --- Library/Homebrew/utils/ruby.sh | 2 +- Library/Homebrew/utils/ruby_check_version_script.rb | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/Library/Homebrew/utils/ruby.sh b/Library/Homebrew/utils/ruby.sh index 123c0c31c2..bbd42a643c 100644 --- a/Library/Homebrew/utils/ruby.sh +++ b/Library/Homebrew/utils/ruby.sh @@ -17,7 +17,7 @@ test_ruby() { # HOMEBREW_PATH is set by global.rb # shellcheck disable=SC2154 find_ruby() { - if [[ -n "${HOMEBREW_MACOS}" ]] + if [[ -n "${HOMEBREW_MACOS}" && -n "${HOMEBREW_USE_RUBY_FROM_PATH}" ]] then echo "/System/Library/Frameworks/Ruby.framework/Versions/Current/usr/bin/ruby" else diff --git a/Library/Homebrew/utils/ruby_check_version_script.rb b/Library/Homebrew/utils/ruby_check_version_script.rb index fc8e483b20..e06ee69c56 100755 --- a/Library/Homebrew/utils/ruby_check_version_script.rb +++ b/Library/Homebrew/utils/ruby_check_version_script.rb @@ -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.canonical_segments -if ruby_version_major != homebrew_required_ruby_version_major || - ruby_version_minor != homebrew_required_ruby_version_minor +if ENV["HOMEBREW_DEVELOPER"].present? && + 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 end