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

utils/ruby.sh: rely on test_ruby's exit code

Browse Source 
Instead of printing "true" or "false", test_ruby now returns 1 when
tested Ruby is not usable and 0 if it is.
This commit is contained in:
Maxim Belkin 2020-06-10 07:56:37 -05:00
parent 9751d3bb8c
commit 23d24dfed7
No known key found for this signature in database
GPG Key ID: AC71560D4C5F2338
1 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4,12 +4,9 @@ test_ruby () {
return 1 return 1
fi fi
local ruby_status "$1" --enable-frozen-string-literal --disable=gems,did_you_mean,rubyopt -rrubygems -e \
ruby_status=$("$1" --enable-frozen-string-literal --disable=gems,did_you_mean,rubyopt -rrubygems -e \ "abort if Gem::Version.new(RUBY_VERSION.to_s.dup).to_s.split('.').first(2) != \
"puts Gem::Version.new(RUBY_VERSION.to_s.dup).to_s.split('.').first(2) == \ Gem::Version.new('$required_ruby_version').to_s.split('.').first(2)" 2>/dev/null
Gem::Version.new('$required_ruby_version').to_s.split('.').first(2)" 2>/dev/null)
test "$ruby_status" = true
} }
setup-ruby-path() { setup-ruby-path() {
@ -17,7 +14,7 @@ setup-ruby-path() {
local vendor_ruby_path local vendor_ruby_path
local vendor_ruby_latest_version local vendor_ruby_latest_version
local vendor_ruby_current_version local vendor_ruby_current_version
local usable_ruby_version local usable_ruby
# When bumping check if HOMEBREW_MACOS_SYSTEM_RUBY_NEW_ENOUGH (in brew.sh) # When bumping check if HOMEBREW_MACOS_SYSTEM_RUBY_NEW_ENOUGH (in brew.sh)
# also needs to be changed. # also needs to be changed.
local required_ruby_version="2.6" local required_ruby_version="2.6"
@ -75,13 +72,13 @@ If there's no Homebrew Portable Ruby available for your processor:
if [[ -n "$HOMEBREW_MACOS_SYSTEM_RUBY_NEW_ENOUGH" ]] if [[ -n "$HOMEBREW_MACOS_SYSTEM_RUBY_NEW_ENOUGH" ]]
then then
usable_ruby_version="true" usable_ruby=true
elif [[ -n "$HOMEBREW_RUBY_PATH" && -z "$HOMEBREW_FORCE_VENDOR_RUBY" ]] && test_ruby "$HOMEBREW_RUBY_PATH" elif [[ -n "$HOMEBREW_RUBY_PATH" && -z "$HOMEBREW_FORCE_VENDOR_RUBY" ]] && test_ruby "$HOMEBREW_RUBY_PATH"
then then
usable_ruby_version=true usable_ruby=true
fi fi
if [[ -z "$HOMEBREW_RUBY_PATH" || -n "$HOMEBREW_FORCE_VENDOR_RUBY" || "$usable_ruby_version" != "true" ]] if [[ -z "$HOMEBREW_RUBY_PATH" || -n "$HOMEBREW_FORCE_VENDOR_RUBY" || -z $usable_ruby ]]
then then
brew vendor-install ruby brew vendor-install ruby
if [[ ! -x "$vendor_ruby_path" ]] if [[ ! -x "$vendor_ruby_path" ]]