diff options
| author | Mike McQuaid | 2016-07-11 16:57:57 +0100 |
|---|---|---|
| committer | Mike McQuaid | 2016-07-12 08:51:36 +0100 |
| commit | 5a2eaf9a1225cfe6f878101e0ff5d647b271b958 (patch) | |
| tree | 929ea17c1a44c4124f19b54c4cf06671d26f0966 /Library | |
| parent | b418fe94c84e229425188ff1b873b34db7b6baf7 (diff) | |
| download | brew-5a2eaf9a1225cfe6f878101e0ff5d647b271b958.tar.bz2 | |
ruby.sh: allow forcing the usage of the vendored Ruby.
Diffstat (limited to 'Library')
| -rw-r--r-- | Library/Homebrew/utils/ruby.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Library/Homebrew/utils/ruby.sh b/Library/Homebrew/utils/ruby.sh index 931f18ac4..98fd34c1b 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" ]] |