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

Merge pull request #9472 from maxim-belkin/simpler-unusable-ruby-logic

Browse Source 
utils/ruby.sh: simplify and fix Ruby-related logic
This commit is contained in:
Maxim Belkin 2020-12-09 21:21:14 -06:00 committed by GitHub
commit 822988794e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -28,12 +28,14 @@ find_ruby() {
fi fi
} }
unusable_ruby() { need_vendored_ruby() {
if [[ -n "$HOMEBREW_MACOS_SYSTEM_RUBY_NEW_ENOUGH" ]] if [[ -n "$HOMEBREW_FORCE_VENDOR_RUBY" ]]
then
return 0
elif [[ -n "$HOMEBREW_MACOS_SYSTEM_RUBY_NEW_ENOUGH" ]]
then then
return 1 return 1
elif [[ -z "$HOMEBREW_MACOS" && -n "$HOMEBREW_RUBY_PATH" && -z "$HOMEBREW_FORCE_VENDOR_RUBY" ]] && elif [[ -z "$HOMEBREW_MACOS" ]] && test_ruby "$HOMEBREW_RUBY_PATH"
test_ruby "$HOMEBREW_RUBY_PATH"
then then
return 1 return 1
else else
@ -93,7 +95,7 @@ If there's no Homebrew Portable Ruby available for your processor:
fi fi
else else
HOMEBREW_RUBY_PATH=$(find_ruby) HOMEBREW_RUBY_PATH=$(find_ruby)
if [[ -z "$HOMEBREW_RUBY_PATH" || -n "$HOMEBREW_FORCE_VENDOR_RUBY" ]] || unusable_ruby if need_vendored_ruby
then then
brew vendor-install ruby || odie "$install_fail" brew vendor-install ruby || odie "$install_fail"
HOMEBREW_RUBY_PATH="$vendor_ruby_path" HOMEBREW_RUBY_PATH="$vendor_ruby_path"