From 5a2eaf9a1225cfe6f878101e0ff5d647b271b958 Mon Sep 17 00:00:00 2001 From: Mike McQuaid Date: Mon, 11 Jul 2016 16:57:57 +0100 Subject: [PATCH] ruby.sh: allow forcing the usage of the vendored Ruby. --- Library/Homebrew/utils/ruby.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Library/Homebrew/utils/ruby.sh b/Library/Homebrew/utils/ruby.sh index 931f18ac48..98fd34c1b4 100644 --- a/Library/Homebrew/utils/ruby.sh +++ b/Library/Homebrew/utils/ruby.sh @@ -22,7 +22,7 @@ original-setup-ruby-path() { } setup-ruby-path() { - if [[ -z "$HOMEBREW_USE_VENDOR_RUBY" ]] + if [[ -z "$HOMEBREW_USE_VENDOR_RUBY" && -z "$HOMEBREW_FORCE_VENDOR_RUBY" ]] then original-setup-ruby-path return @@ -70,7 +70,7 @@ setup-ruby-path() { ruby_version_major="${ruby_version_major%%.*}" fi - if [[ "$ruby_version_major" != "2" ]] + if [[ "$ruby_version_major" != "2" || -n "$HOMEBREW_FORCE_VENDOR_RUBY" ]] then brew vendor-install ruby --quiet if [[ ! -x "$vendor_ruby_path" ]]