From 73277e71b17370ca46b8a5b354ed8c7473d33a91 Mon Sep 17 00:00:00 2001 From: Xu Cheng Date: Fri, 8 May 2015 14:41:19 +0800 Subject: [PATCH] RubyRequirement: clean up 1. Remove dead code (RubyRequirement always has a version) 2. Perfer `Utils.popen_read` instead of backticks. --- Library/Homebrew/requirements/ruby_requirement.rb | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/Library/Homebrew/requirements/ruby_requirement.rb b/Library/Homebrew/requirements/ruby_requirement.rb index d70639cec3..1449bf509c 100644 --- a/Library/Homebrew/requirements/ruby_requirement.rb +++ b/Library/Homebrew/requirements/ruby_requirement.rb @@ -10,7 +10,7 @@ class RubyRequirement < Requirement satisfy :build_env => false do next unless which "ruby" - version = /\d\.\d/.match `ruby --version 2>&1` + version = /\d\.\d/.match Utils.popen_read("ruby", "--version") next unless version Version.new(version.to_s) >= Version.new(@version) end @@ -20,9 +20,7 @@ class RubyRequirement < Requirement end def message - version_string = " #{@version}" if @version - - s = "Ruby#{version_string} is required to install this formula." + s = "Ruby #{@version} is required to install this formula." s += super s end