diff options
| author | Jack Nagel | 2013-11-09 19:01:31 -0600 |
|---|---|---|
| committer | Jack Nagel | 2013-11-09 19:04:46 -0600 |
| commit | 4cbaeb6d61f10db1abcb3f844c3bc234107732c5 (patch) | |
| tree | e189e4f16c0c3353d89a8cb620f053d078393256 /Library | |
| parent | 1f1678a1d5071f3ea63371c9d1a36535e05d9ed5 (diff) | |
| download | brew-4cbaeb6d61f10db1abcb3f844c3bc234107732c5.tar.bz2 | |
Clarify XQuartz warning
Closes Homebrew/homebrew#24094.
Diffstat (limited to 'Library')
| -rw-r--r-- | Library/Homebrew/cmd/doctor.rb | 25 |
1 files changed, 16 insertions, 9 deletions
diff --git a/Library/Homebrew/cmd/doctor.rb b/Library/Homebrew/cmd/doctor.rb index 28e8e0cda..a7b159b69 100644 --- a/Library/Homebrew/cmd/doctor.rb +++ b/Library/Homebrew/cmd/doctor.rb @@ -1081,19 +1081,26 @@ end end def check_for_latest_xquartz - quartz = MacOS::XQuartz.version - return unless quartz + return unless MacOS::XQuartz.installed? return if MacOS::XQuartz.provided_by_apple? - quartz = Version.new(quartz) - latest = Version.new(MacOS::XQuartz.latest_version) + installed_version = Version.new(MacOS::XQuartz.version) + latest_version = Version.new(MacOS::XQuartz.latest_version) - return if quartz >= latest + return if installed_version >= latest_version - <<-EOS.undent - Your XQuartz (#{quartz}) is outdated - Please install XQuartz #{latest}. - EOS + case MacOS.version + when "10.9" then <<-EOS.undent + Your XQuartz (#{installed_version}) is outdated + OS X Mavericks requires XQuartz #{latest_version}: + http://xquartz.macosforge.org/trac/wiki/X112.7.5 + EOS + else <<-EOS.undent + Your XQuartz (#{installed_version}) is outdated + Please install XQuartz #{latest_version}: + https://xquartz.macosforge.org + EOS + end end end # end class Checks |
