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

utils/ruby.sh: set TERMINFO_DIRS to bundled terminfo

Browse Source
This commit is contained in:
Bo Anderson 2020-06-10 14:36:18 +01:00
parent b5a6e611c2
commit 87931e1c03
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -23,9 +23,11 @@ If there's no Homebrew Portable Ruby available for your processor:
" "
vendor_dir="$HOMEBREW_LIBRARY/Homebrew/vendor" vendor_dir="$HOMEBREW_LIBRARY/Homebrew/vendor"
vendor_ruby_path="$vendor_dir/portable-ruby/current/bin/ruby" vendor_ruby_root="$vendor_dir/portable-ruby/current"
vendor_ruby_path="$vendor_ruby_root/bin/ruby"
vendor_ruby_terminfo="$vendor_ruby_root/share/terminfo"
vendor_ruby_latest_version=$(<"$vendor_dir/portable-ruby-version") vendor_ruby_latest_version=$(<"$vendor_dir/portable-ruby-version")
vendor_ruby_current_version=$(readlink "$vendor_dir/portable-ruby/current") vendor_ruby_current_version=$(readlink "$vendor_ruby_root")
unset HOMEBREW_RUBY_PATH unset HOMEBREW_RUBY_PATH
@ -37,6 +39,7 @@ If there's no Homebrew Portable Ruby available for your processor:
if [[ -x "$vendor_ruby_path" ]] if [[ -x "$vendor_ruby_path" ]]
then then
HOMEBREW_RUBY_PATH="$vendor_ruby_path" HOMEBREW_RUBY_PATH="$vendor_ruby_path"
[[ -z "$HOMEBREW_MACOS" ]] && TERMINFO_DIRS="$vendor_ruby_terminfo"
if [[ $vendor_ruby_current_version != $vendor_ruby_latest_version ]] if [[ $vendor_ruby_current_version != $vendor_ruby_latest_version ]]
then then
if ! brew vendor-install ruby if ! brew vendor-install ruby
@ -87,8 +90,10 @@ If there's no Homebrew Portable Ruby available for your processor:
fi fi
fi fi
HOMEBREW_RUBY_PATH="$vendor_ruby_path" HOMEBREW_RUBY_PATH="$vendor_ruby_path"
[[ -z "$HOMEBREW_MACOS" ]] && TERMINFO_DIRS="$vendor_ruby_terminfo"
fi fi
fi fi
export HOMEBREW_RUBY_PATH export HOMEBREW_RUBY_PATH
export TERMINFO_DIRS
} }