admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

Use Utils.popen_read in XQuartz version codepath

Browse Source
This commit is contained in:
Jack Nagel 2014-07-11 15:29:26 -05:00
parent 72129668f4
commit 677cd51977
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Library/Homebrew/os/mac.rb
View File

@ -231,13 +231,13 @@ module OS
def mdfind(*ids) def mdfind(*ids)
return [] unless OS.mac? return [] unless OS.mac?
(@mdfind ||= {}).fetch(ids) do (@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
end end
def pkgutil_info(id) def pkgutil_info(id)
(@pkginfo ||= {}).fetch(id) do |key| (@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
end end

4
Library/Homebrew/os/mac/xquartz.rb
View File

@ -56,7 +56,9 @@ module OS
end end
def version_from_mdls(path) 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? version unless version.empty?
end end