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

Merge pull request #11330 from Bo98/ruby-search-fix

Browse Source 
utils/ruby.sh: fix Ruby path searching
This commit is contained in:
Bo Anderson 2021-05-06 00:08:40 +01:00 committed by GitHub
commit 3e32762607
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -15,14 +15,15 @@ test_ruby() {
# HOMEBREW_MACOS is set by brew.sh # HOMEBREW_MACOS is set by brew.sh
# HOMEBREW_PATH is set by global.rb # HOMEBREW_PATH is set by global.rb
# shellcheck disable=SC2154 # SC2230 falsely flags `which -a`
# shellcheck disable=SC2154,SC2230
find_ruby() { find_ruby() {
if [[ -n "${HOMEBREW_MACOS}" ]] if [[ -n "${HOMEBREW_MACOS}" ]]
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
IFS=$'\n' # Do word splitting on new lines only IFS=$'\n' # Do word splitting on new lines only
for ruby_exec in $(command -v -a ruby 2>/dev/null) $(PATH=${HOMEBREW_PATH} command -v -a ruby 2>/dev/null) for ruby_exec in $(which -a ruby 2>/dev/null) $(PATH=${HOMEBREW_PATH} which -a ruby 2>/dev/null)
do do
if test_ruby "${ruby_exec}"; then if test_ruby "${ruby_exec}"; then
echo "${ruby_exec}" echo "${ruby_exec}"