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

ruby.sh: allow forcing the usage of the vendored Ruby.

Browse Source
This commit is contained in:
Mike McQuaid 2016-07-11 16:57:57 +01:00
parent b418fe94c8
commit 5a2eaf9a12
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -22,7 +22,7 @@ original-setup-ruby-path() {
} }
setup-ruby-path() { setup-ruby-path() {
if [[ -z "$HOMEBREW_USE_VENDOR_RUBY" ]] if [[ -z "$HOMEBREW_USE_VENDOR_RUBY" && -z "$HOMEBREW_FORCE_VENDOR_RUBY" ]]
then then
original-setup-ruby-path original-setup-ruby-path
return return
@ -70,7 +70,7 @@ setup-ruby-path() {
ruby_version_major="${ruby_version_major%%.*}" ruby_version_major="${ruby_version_major%%.*}"
fi fi
if [[ "$ruby_version_major" != "2" ]] if [[ "$ruby_version_major" != "2" || -n "$HOMEBREW_FORCE_VENDOR_RUBY" ]]
then then
brew vendor-install ruby --quiet brew vendor-install ruby --quiet
if [[ ! -x "$vendor_ruby_path" ]] if [[ ! -x "$vendor_ruby_path" ]]