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

Fall back on pkgutil when mdls cannot determine XQuartz version

Browse Source
This commit is contained in:
Jack Nagel 2013-07-21 19:11:06 -05:00
parent d355227036
commit 34623b4ef1
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -11,8 +11,8 @@ module MacOS::XQuartz extend self
end end
def detect_version def detect_version
if (path = bundle_path) && path.exist? if (path = bundle_path) && path.exist? && (version = version_from_mdls(path))
version_from_mdls(path) version
elsif prefix.to_s == "/usr/X11" elsif prefix.to_s == "/usr/X11"
guess_system_version guess_system_version
else else
@ -29,7 +29,8 @@ module MacOS::XQuartz extend self
end end
def version_from_mdls(path) def version_from_mdls(path)
`mdls -raw -name kMDItemVersion "#{path}" 2>/dev/null`.strip version = `mdls -raw -nullMarker "" -name kMDItemVersion "#{path}" 2>/dev/null`.strip
version unless version.empty?
end end
# The XQuartz that Apple shipped in OS X through 10.7 does not have a # The XQuartz that Apple shipped in OS X through 10.7 does not have a