From 7a9f3eb8003e85b3512222dfdf1839e55524c910 Mon Sep 17 00:00:00 2001 From: Bo Anderson Date: Tue, 21 Nov 2023 15:03:22 +0000 Subject: [PATCH] utils/ruby.sh: don't _require_ 3.1 in HOMEBREW_RUBY3 mode --- Library/Homebrew/utils/ruby.sh | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/Library/Homebrew/utils/ruby.sh b/Library/Homebrew/utils/ruby.sh index 947fdd9ccec4a..1a08460821d81 100644 --- a/Library/Homebrew/utils/ruby.sh +++ b/Library/Homebrew/utils/ruby.sh @@ -10,16 +10,24 @@ test_ruby() { return 1 fi + supported_ruby_versions=() if [[ -n "${HOMEBREW_RUBY3}" && -z "${HOMEBREW_USE_RUBY_FROM_PATH}" ]] then - required_ruby_version="3.1.0" - else - required_ruby_version="${HOMEBREW_REQUIRED_RUBY_VERSION}" + supported_ruby_versions+=("3.1.0") fi + supported_ruby_versions+=("${HOMEBREW_REQUIRED_RUBY_VERSION}") - "$1" --enable-frozen-string-literal --disable=gems,did_you_mean,rubyopt \ - "${HOMEBREW_LIBRARY}/Homebrew/utils/ruby_check_version_script.rb" \ - "${required_ruby_version}" 2>/dev/null + for ruby_version in "${supported_ruby_versions[@]}" + do + if "$1" --enable-frozen-string-literal --disable=gems,did_you_mean,rubyopt \ + "${HOMEBREW_LIBRARY}/Homebrew/utils/ruby_check_version_script.rb" \ + "${ruby_version}" 2>/dev/null + then + return 0 + fi + done + + return 1 } can_use_ruby_from_path() {