aboutsummaryrefslogtreecommitdiffstats
path: root/Library
diff options
context:
space:
mode:
authorJack Nagel2012-02-27 23:43:19 -0600
committerJack Nagel2012-02-27 23:43:56 -0600
commit4ab1f7ab8ecd0cba08e209f43e51de3128e2ddc5 (patch)
treebe7ab6a099afdf4a0801c49d9bab563fa2b8f5fa /Library
parent3e0027bf18310c16c8789b2c9a1c26227d8239b0 (diff)
downloadhomebrew-4ab1f7ab8ecd0cba08e209f43e51de3128e2ddc5.tar.bz2
Show real path to x11 in --config output
Signed-off-by: Jack Nagel <jacknagel@gmail.com>
Diffstat (limited to 'Library')
-rw-r--r--Library/Homebrew/cmd/--config.rb10
1 files changed, 9 insertions, 1 deletions
diff --git a/Library/Homebrew/cmd/--config.rb b/Library/Homebrew/cmd/--config.rb
index 9b6fec110..98b943b19 100644
--- a/Library/Homebrew/cmd/--config.rb
+++ b/Library/Homebrew/cmd/--config.rb
@@ -36,6 +36,14 @@ module Homebrew extend self
if sha.empty? then "(none)" else sha end
end
+ def describe_x11
+ return "N/A" unless x11_installed?
+ return case x11_path = Pathname.new("/usr/x11").realpath.to_s
+ when "/usr/x11" then "/usr/x11"
+ else "/usr/x11 => #{x11_path}"
+ end
+ end
+
def describe_perl
perl = `which perl`.chomp
return "N/A" if perl.empty?
@@ -82,7 +90,7 @@ module Homebrew extend self
LLVM: #{llvm ? "build #{llvm}" : "N/A"}
Clang: #{clang ? "#{clang} build #{clang_build}" : "N/A"}
MacPorts or Fink? #{macports_or_fink_installed?}
- X11 installed? #{x11_installed?}
+ X11: #{describe_x11}
System Ruby: #{RUBY_VERSION}-#{RUBY_PATCHLEVEL}
/usr/bin/ruby => #{real_path("/usr/bin/ruby")}
Which Perl: #{describe_perl}