aboutsummaryrefslogtreecommitdiffstats
path: root/Library
diff options
context:
space:
mode:
authorKimmo Lehto2017-02-21 11:24:53 +0200
committerKimmo Lehto2017-02-21 11:24:53 +0200
commitdf7ae5eb26a9552ff61c66ed5680c701bf0be7df (patch)
tree9ed63c28dbfcf8398379eeff8b511440c26731ca /Library
parent799da6dbe80b4808e66d81c0004d279abcbf55ea (diff)
downloadbrew-df7ae5eb26a9552ff61c66ed5680c701bf0be7df.tar.bz2
Use the env block
Diffstat (limited to 'Library')
-rw-r--r--Library/Homebrew/requirements/ruby_requirement.rb13
1 files changed, 8 insertions, 5 deletions
diff --git a/Library/Homebrew/requirements/ruby_requirement.rb b/Library/Homebrew/requirements/ruby_requirement.rb
index e432edddb..817cf3e32 100644
--- a/Library/Homebrew/requirements/ruby_requirement.rb
+++ b/Library/Homebrew/requirements/ruby_requirement.rb
@@ -8,11 +8,10 @@ class RubyRequirement < Requirement
super
end
- satisfy build_env: false do
- found_ruby = rubies.detect { |ruby| suitable?(ruby) }
- return unless found_ruby
- ENV.prepend_path "PATH", found_ruby.dirname
- found_ruby
+ satisfy build_env: false { suitable_ruby }
+
+ env do
+ ENV.prepend_path "PATH", suitable_ruby
end
def message
@@ -35,6 +34,10 @@ class RubyRequirement < Requirement
private
+ def suitable_ruby
+ rubies.detect { |ruby| suitable?(ruby) }
+ end
+
def rubies
rubies = which_all("ruby")
if ruby_formula.installed?