From df7ae5eb26a9552ff61c66ed5680c701bf0be7df Mon Sep 17 00:00:00 2001
From: Kimmo Lehto <kimmo.lehto@kontena.io>
Date: Tue, 21 Feb 2017 11:24:53 +0200
Subject: [PATCH] Use the env block

---
 Library/Homebrew/requirements/ruby_requirement.rb | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/Library/Homebrew/requirements/ruby_requirement.rb b/Library/Homebrew/requirements/ruby_requirement.rb
index e432edddbe..817cf3e327 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?