Extract version_from_mdls

This commit is contained in:
Jack Nagel 2013-07-21 19:11:05 -05:00
parent 0b5551ee5b
commit c325520316

View File

@ -10,7 +10,7 @@ module MacOS::XQuartz extend self
@version ||= begin @version ||= begin
path = bundle_path path = bundle_path
if not path.nil? and path.exist? if not path.nil? and path.exist?
`mdls -raw -name kMDItemVersion "#{path}" 2>/dev/null`.strip version_from_mdls(path)
elsif prefix.to_s == "/usr/X11" elsif prefix.to_s == "/usr/X11"
guess_system_version guess_system_version
else else
@ -29,6 +29,10 @@ module MacOS::XQuartz extend self
MacOS.app_with_bundle_id(FORGE_BUNDLE_ID) || MacOS.app_with_bundle_id(APPLE_BUNDLE_ID) MacOS.app_with_bundle_id(FORGE_BUNDLE_ID) || MacOS.app_with_bundle_id(APPLE_BUNDLE_ID)
end end
def version_from_mdls(path)
`mdls -raw -name kMDItemVersion "#{path}" 2>/dev/null`.strip
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
# pkg-util entry, so if Spotlight indexing is disabled we must make an # pkg-util entry, so if Spotlight indexing is disabled we must make an
# educated guess as to what version is installed. # educated guess as to what version is installed.