From 677cd519778ab66e19699d847b03a2f3d958bd2a Mon Sep 17 00:00:00 2001
From: Jack Nagel <jacknagel@gmail.com>
Date: Fri, 11 Jul 2014 15:29:26 -0500
Subject: [PATCH] Use Utils.popen_read in XQuartz version codepath

---
 Library/Homebrew/os/mac.rb         | 4 ++--
 Library/Homebrew/os/mac/xquartz.rb | 4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/Library/Homebrew/os/mac.rb b/Library/Homebrew/os/mac.rb
index 0cff0e64c1..5f245b23c6 100644
--- a/Library/Homebrew/os/mac.rb
+++ b/Library/Homebrew/os/mac.rb
@@ -231,13 +231,13 @@ module OS
     def mdfind(*ids)
       return [] unless OS.mac?
       (@mdfind ||= {}).fetch(ids) do
-        @mdfind[ids] = `/usr/bin/mdfind "#{mdfind_query(*ids)}"`.split("\n")
+        @mdfind[ids] = Utils.popen_read("/usr/bin/mdfind", mdfind_query(*ids), &:read).split("\n")
       end
     end
 
     def pkgutil_info(id)
       (@pkginfo ||= {}).fetch(id) do |key|
-        @pkginfo[key] = `/usr/sbin/pkgutil --pkg-info "#{key}" 2>/dev/null`.strip
+        @pkginfo[key] = Utils.popen_read("/usr/sbin/pkgutil", "--pkg-info", key, &:read).strip
       end
     end
 
diff --git a/Library/Homebrew/os/mac/xquartz.rb b/Library/Homebrew/os/mac/xquartz.rb
index cec7bf9e6d..eb30bca136 100644
--- a/Library/Homebrew/os/mac/xquartz.rb
+++ b/Library/Homebrew/os/mac/xquartz.rb
@@ -56,7 +56,9 @@ module OS
       end
 
       def version_from_mdls(path)
-        version = `mdls -raw -nullMarker "" -name kMDItemVersion "#{path}" 2>/dev/null`.strip
+        version = Utils.popen_read(
+          "/usr/bin/mdls", "-raw", "-nullMarker", "", "-name", "kMDItemVersion", path.to_s, &:read
+        ).strip
         version unless version.empty?
       end