diff options
| author | Mike McQuaid | 2016-07-12 09:13:23 +0100 |
|---|---|---|
| committer | GitHub | 2016-07-12 09:13:23 +0100 |
| commit | 873aa670d1f2a71c9b842827cf1d97796c8171da (patch) | |
| tree | f21e0bb4d71be3191a998479ec83013ae8d17a89 /Library | |
| parent | c598e1afd5516724be8a67f2c929578bfeb69a18 (diff) | |
| parent | dd14357b484b1d3b05a79ea61bbf1e06ea63f273 (diff) | |
| download | brew-873aa670d1f2a71c9b842827cf1d97796c8171da.tar.bz2 | |
Merge pull request #494 from MikeMcQuaid/vendor-ruby-tweaks
Vendored Ruby tweaks
Diffstat (limited to 'Library')
| -rw-r--r-- | Library/Homebrew/utils/ruby.sh | 8 | ||||
| -rw-r--r-- | Library/brew.sh | 10 |
2 files changed, 9 insertions, 9 deletions
diff --git a/Library/Homebrew/utils/ruby.sh b/Library/Homebrew/utils/ruby.sh index 6ff97b772..98fd34c1b 100644 --- a/Library/Homebrew/utils/ruby.sh +++ b/Library/Homebrew/utils/ruby.sh @@ -1,4 +1,4 @@ -origin-setup-ruby-path() { +original-setup-ruby-path() { if [[ -z "$HOMEBREW_DEVELOPER" ]] then unset HOMEBREW_RUBY_PATH @@ -22,9 +22,9 @@ origin-setup-ruby-path() { } setup-ruby-path() { - if [[ -z "$HOMEBREW_USE_VENDOR_RUBY" ]] + if [[ -z "$HOMEBREW_USE_VENDOR_RUBY" && -z "$HOMEBREW_FORCE_VENDOR_RUBY" ]] then - origin-setup-ruby-path + original-setup-ruby-path return fi @@ -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" ]] diff --git a/Library/brew.sh b/Library/brew.sh index 3e137323c..03eaa4390 100644 --- a/Library/brew.sh +++ b/Library/brew.sh @@ -211,11 +211,6 @@ fi # Hide shellcheck complaint: # shellcheck source=/dev/null -source "$HOMEBREW_LIBRARY/Homebrew/utils/ruby.sh" -setup-ruby-path - -# Hide shellcheck complaint: -# shellcheck source=/dev/null source "$HOMEBREW_LIBRARY/Homebrew/utils/analytics.sh" setup-analytics report-analytics-screenview-command @@ -243,6 +238,11 @@ then source "$HOMEBREW_BASH_COMMAND" { update-preinstall; "homebrew-$HOMEBREW_COMMAND" "$@"; exit $?; } else + # Hide shellcheck complaint: + # shellcheck source=/dev/null + source "$HOMEBREW_LIBRARY/Homebrew/utils/ruby.sh" + setup-ruby-path + # Unshift command back into argument list (unless argument list was empty). [[ "$HOMEBREW_ARG_COUNT" -gt 0 ]] && set -- "$HOMEBREW_COMMAND" "$@" { update-preinstall; exec "$HOMEBREW_RUBY_PATH" -W0 "$HOMEBREW_LIBRARY/brew.rb" "$@"; } |