aboutsummaryrefslogtreecommitdiffstats
path: root/Library/Homebrew/extend
diff options
context:
space:
mode:
authorMike McQuaid2016-10-02 17:30:08 +0100
committerMike McQuaid2016-10-02 17:30:08 +0100
commit8a57fee68c4a52b371d94f878c2fac495fa1ff95 (patch)
treeb61ae15848158cf0e865f1be2387343eaaff8078 /Library/Homebrew/extend
parent4f916cdfee8d95fd9437c018877fa6a47a89e83e (diff)
downloadbrew-8a57fee68c4a52b371d94f878c2fac495fa1ff95.tar.bz2
*/diagnostic: tweak messaging.
Update some messaging based on recent user confusion and the `/usr/local/Homebrew` and Ruby 2 migrations.
Diffstat (limited to 'Library/Homebrew/extend')
-rw-r--r--Library/Homebrew/extend/os/mac/diagnostic.rb11
1 files changed, 5 insertions, 6 deletions
diff --git a/Library/Homebrew/extend/os/mac/diagnostic.rb b/Library/Homebrew/extend/os/mac/diagnostic.rb
index 063558f19..0ac95bfd9 100644
--- a/Library/Homebrew/extend/os/mac/diagnostic.rb
+++ b/Library/Homebrew/extend/os/mac/diagnostic.rb
@@ -65,8 +65,8 @@ module Homebrew
return unless MacOS::Xcode.installed? && MacOS::Xcode.outdated?
message = <<-EOS.undent
- Your Xcode (#{MacOS::Xcode.version}) is outdated
- Please update to Xcode #{MacOS::Xcode.latest_version}.
+ Your Xcode (#{MacOS::Xcode.version}) is outdated.
+ Please update to Xcode #{MacOS::Xcode.latest_version} (or delete it).
#{MacOS::Xcode.update_instructions}
EOS
@@ -171,8 +171,7 @@ module Homebrew
end
def check_ruby_version
- ruby_version = MacOS.version >= "10.9" ? "2.0" : "1.8"
- return if RUBY_VERSION[/\d\.\d/] == ruby_version
+ return if RUBY_VERSION[/\d\.\d/] == "2.0"
<<-EOS.undent
Ruby version #{RUBY_VERSION} is unsupported on #{MacOS.version}. Homebrew
@@ -264,8 +263,8 @@ module Homebrew
return if installed_version >= latest_version
<<-EOS.undent
- Your XQuartz (#{installed_version}) is outdated
- Please install XQuartz #{latest_version}:
+ Your XQuartz (#{installed_version}) is outdated.
+ Please install XQuartz #{latest_version} (or delete it):
https://xquartz.macosforge.org
EOS
end