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

Make "XQuartz is installed" heurstic stricter

Browse Source
This commit is contained in:
Jack Nagel 2012-12-21 12:55:38 -06:00
parent 89b5ee6295
commit 43108e42d9
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Library/Homebrew/macos/xquartz.rb
View File

@ -6,9 +6,11 @@ module MacOS::XQuartz extend self
# The X11.app distributed by Apple is also XQuartz, and therefore covered
# by this method.
def version
path = MacOS.app_with_bundle_id(FORGE_BUNDLE_ID) || MacOS.app_with_bundle_id(APPLE_BUNDLE_ID)
version = if not path.nil? and path.exist?
`mdls -raw -name kMDItemVersion "#{path}" 2>/dev/null`.strip
@version ||= begin
path = MacOS.app_with_bundle_id(FORGE_BUNDLE_ID) || MacOS.app_with_bundle_id(APPLE_BUNDLE_ID)
if not path.nil? and path.exist?
`mdls -raw -name kMDItemVersion "#{path}" 2>/dev/null`.strip
end
end
end
@ -34,7 +36,7 @@ module MacOS::XQuartz extend self
end
def installed?
not prefix.nil?
!version.nil? && !prefix.nil?
end
end