diff options
| author | Jack Nagel | 2012-11-12 19:42:26 -0600 |
|---|---|---|
| committer | Jack Nagel | 2012-11-12 19:48:09 -0600 |
| commit | e40a7d498535b01f72429249498f788b77409286 (patch) | |
| tree | c98ceb07bf6c149cda493445fe362a4eb1ec1296 /Library/Homebrew | |
| parent | dfc8ab24cec4f2854d45052ab65156186116f5be (diff) | |
| download | homebrew-e40a7d498535b01f72429249498f788b77409286.tar.bz2 | |
Don't advise XQuartz upgrades for system X11
Yeah, yeah. The XQuartz/X11 stuff is confusing.
Diffstat (limited to 'Library/Homebrew')
| -rw-r--r-- | Library/Homebrew/cmd/doctor.rb | 1 | ||||
| -rw-r--r-- | Library/Homebrew/macos/xquartz.rb | 6 |
2 files changed, 7 insertions, 0 deletions
diff --git a/Library/Homebrew/cmd/doctor.rb b/Library/Homebrew/cmd/doctor.rb index c02323365..4a4496fbd 100644 --- a/Library/Homebrew/cmd/doctor.rb +++ b/Library/Homebrew/cmd/doctor.rb @@ -976,6 +976,7 @@ end def check_for_latest_xquartz quartz = MacOS::XQuartz.version return unless quartz + return if MacOS::XQuartz.provided_by_apple? quartz = Version.new(quartz) latest = Version.new(MacOS::XQuartz.latest_version) diff --git a/Library/Homebrew/macos/xquartz.rb b/Library/Homebrew/macos/xquartz.rb index 346fdd412..6e64901fc 100644 --- a/Library/Homebrew/macos/xquartz.rb +++ b/Library/Homebrew/macos/xquartz.rb @@ -16,6 +16,12 @@ module MacOS::XQuartz extend self "2.7.4" end + def provided_by_apple? + [FORGE_BUNDLE_ID, APPLE_BUNDLE_ID].find do |id| + MacOS.app_with_bundle_id(id) + end == APPLE_BUNDLE_ID + end + # This should really be private, but for compatibility reasons it must # remain public. New code should use MacOS::XQuartz.{bin,lib,include} # instead, as that accounts for Xcode-only systems. |