aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike McQuaid2016-11-10 21:05:21 +0000
committerGitHub2016-11-10 21:05:21 +0000
commitc2815fbb9af4fe4518246cba7df418935fd3b711 (patch)
tree13b95795df816cec3c1bc0d169f905d4fa0abea7
parent42aa0982f9a39f321aeb2a186ebd9d9144d6a5bb (diff)
parent969ac3a9c63ba670554b274dcc1fa1b5c2eadbb8 (diff)
downloadbrew-c2815fbb9af4fe4518246cba7df418935fd3b711.tar.bz2
Merge pull request #1381 from adzenith/patch-1
`brew doctor` recommends using cask to upgrade XQuartz
-rw-r--r--Library/Homebrew/cask/lib/hbc/exceptions.rb6
-rw-r--r--Library/Homebrew/extend/os/mac/diagnostic.rb5
2 files changed, 5 insertions, 6 deletions
diff --git a/Library/Homebrew/cask/lib/hbc/exceptions.rb b/Library/Homebrew/cask/lib/hbc/exceptions.rb
index 8a128a52b..14c52e94b 100644
--- a/Library/Homebrew/cask/lib/hbc/exceptions.rb
+++ b/Library/Homebrew/cask/lib/hbc/exceptions.rb
@@ -84,13 +84,11 @@ module Hbc
class CaskX11DependencyError < AbstractCaskErrorWithToken
def to_s
<<-EOS.undent
- #{token} requires XQuartz/X11, which can be installed via homebrew-cask by
-
+ #{token} requires XQuartz/X11, which can be installed using Homebrew-Cask by running
brew cask install xquartz
or manually, by downloading the package from
-
- https://www.xquartz.org/
+ #{Formatter.url("https://www.xquartz.org/")}
EOS
end
end
diff --git a/Library/Homebrew/extend/os/mac/diagnostic.rb b/Library/Homebrew/extend/os/mac/diagnostic.rb
index 0f37e8af5..9c106acf1 100644
--- a/Library/Homebrew/extend/os/mac/diagnostic.rb
+++ b/Library/Homebrew/extend/os/mac/diagnostic.rb
@@ -292,8 +292,9 @@ module Homebrew
<<-EOS.undent
Your XQuartz (#{installed_version}) is outdated.
- Please install XQuartz #{latest_version} (or delete it):
- https://xquartz.macosforge.org
+ Please install XQuartz #{latest_version} (or delete the current version).
+ XQuartz can be updated using Homebrew-Cask by running
+ brew cask reinstall xquartz
EOS
end