diff options
| author | Jack Nagel | 2013-11-09 19:01:31 -0600 |
|---|---|---|
| committer | Jack Nagel | 2013-11-09 19:04:46 -0600 |
| commit | 628675e596c9f4d55eb0f615e2f10f7243db4530 (patch) | |
| tree | 452355de097540971673a46cefd53b6c7bbd95b6 | |
| parent | 143d5474b59f5094b9e3d1eff3aedfe4e5c68241 (diff) | |
| download | homebrew-628675e596c9f4d55eb0f615e2f10f7243db4530.tar.bz2 | |
Clarify XQuartz warning
Closes #24094.
| -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 |
