From 34623b4ef1ac360855e1e3e2d7217b21820ee63f Mon Sep 17 00:00:00 2001 From: Jack Nagel Date: Sun, 21 Jul 2013 19:11:06 -0500 Subject: [PATCH] Fall back on pkgutil when mdls cannot determine XQuartz version --- Library/Homebrew/os/mac/xquartz.rb | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Library/Homebrew/os/mac/xquartz.rb b/Library/Homebrew/os/mac/xquartz.rb index ed7473cefa..b1bd45d2cb 100644 --- a/Library/Homebrew/os/mac/xquartz.rb +++ b/Library/Homebrew/os/mac/xquartz.rb @@ -11,8 +11,8 @@ module MacOS::XQuartz extend self end def detect_version - if (path = bundle_path) && path.exist? - version_from_mdls(path) + if (path = bundle_path) && path.exist? && (version = version_from_mdls(path)) + version elsif prefix.to_s == "/usr/X11" guess_system_version else @@ -29,7 +29,8 @@ module MacOS::XQuartz extend self end 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 # The XQuartz that Apple shipped in OS X through 10.7 does not have a