aboutsummaryrefslogtreecommitdiffstats
path: root/Library
diff options
context:
space:
mode:
authorXu Cheng2016-01-02 23:21:58 +0800
committerXu Cheng2016-01-03 21:00:11 +0800
commit15fe924484f22a295f9b024b68f946e410c5531e (patch)
treeec1aaf2a59f8c14e70404df65fef44da734a806b /Library
parent17a57f529b4df5f4de6a2e8d41394422290c4522 (diff)
downloadbrew-15fe924484f22a295f9b024b68f946e410c5531e.tar.bz2
RubyRequirement: check all available ruby
Closes Homebrew/homebrew#47605. Signed-off-by: Xu Cheng <xucheng@me.com>
Diffstat (limited to 'Library')
-rw-r--r--Library/Homebrew/requirements/ruby_requirement.rb13
1 files changed, 5 insertions, 8 deletions
diff --git a/Library/Homebrew/requirements/ruby_requirement.rb b/Library/Homebrew/requirements/ruby_requirement.rb
index 1449bf509..87db39777 100644
--- a/Library/Homebrew/requirements/ruby_requirement.rb
+++ b/Library/Homebrew/requirements/ruby_requirement.rb
@@ -9,14 +9,11 @@ class RubyRequirement < Requirement
end
satisfy :build_env => false do
- next unless which "ruby"
- version = /\d\.\d/.match Utils.popen_read("ruby", "--version")
- next unless version
- Version.new(version.to_s) >= Version.new(@version)
- end
-
- env do
- ENV.prepend_path "PATH", which("ruby").dirname
+ which_all("ruby").detect do |ruby|
+ version = /\d\.\d/.match Utils.popen_read(ruby, "--version")
+ next unless version
+ Version.new(version.to_s) >= Version.new(@version)
+ end
end
def message