aboutsummaryrefslogtreecommitdiffstats
path: root/Library/Homebrew/cmd
diff options
context:
space:
mode:
authorJack Nagel2014-12-30 23:33:50 -0500
committerJack Nagel2014-12-30 23:33:50 -0500
commit77c0f60434aa9c51ef5b052a43a200ea2b39f04f (patch)
treed9c7ae96c3e5033dae036480c04bcc242a61efec /Library/Homebrew/cmd
parentb10c58d6e29885278180179a051c25ce714a7f20 (diff)
downloadbrew-77c0f60434aa9c51ef5b052a43a200ea2b39f04f.tar.bz2
Always dump full configuration
Diffstat (limited to 'Library/Homebrew/cmd')
-rw-r--r--Library/Homebrew/cmd/config.rb31
1 files changed, 2 insertions, 29 deletions
diff --git a/Library/Homebrew/cmd/config.rb b/Library/Homebrew/cmd/config.rb
index 652ea17c6..9d8835e41 100644
--- a/Library/Homebrew/cmd/config.rb
+++ b/Library/Homebrew/cmd/config.rb
@@ -2,7 +2,7 @@ require 'hardware'
module Homebrew
def config
- dump_verbose_config(STDOUT)
+ dump_verbose_config
end
def llvm
@@ -94,34 +94,7 @@ module Homebrew
@ponk.join(", ") unless @ponk.empty?
end
- # we try to keep output minimal
- def dump_build_config(f=STDOUT)
- f.puts "HOMEBREW_VERSION: #{HOMEBREW_VERSION}"
- f.puts "HEAD: #{head}"
- f.puts "HOMEBREW_PREFIX: #{HOMEBREW_PREFIX}" if HOMEBREW_PREFIX.to_s != "/usr/local"
- f.puts "HOMEBREW_CELLAR: #{HOMEBREW_CELLAR}" if HOMEBREW_CELLAR.to_s != "#{HOMEBREW_PREFIX}/Cellar"
- f.puts hardware
- f.puts "OS X: #{MACOS_FULL_VERSION}-#{kernel}"
- f.puts "Xcode: #{xcode}" if xcode
- f.puts "CLT: #{clt}" if clt
-
- ruby_version = MacOS.version >= "10.9" ? "2.0" : "1.8"
- if RUBY_VERSION[/\d\.\d/] != ruby_version
- f.puts "#{RUBY_PATH}:\n #{RUBY_VERSION}-#{RUBY_PATCHLEVEL}"
- end
-
- unless MacOS.compilers_standard?
- f.puts "GCC-4.0: build #{gcc_40}" if gcc_40
- f.puts "GCC-4.2: build #{gcc_42}" if gcc_42
- f.puts "LLVM-GCC: build #{llvm}" if llvm
- f.puts "Clang: #{clang ? "#{clang} build #{clang_build}" : "N/A"}"
- end
-
- f.puts "MacPorts/Fink: #{macports_or_fink}" if macports_or_fink
- f.puts "X11: #{describe_x11}"
- end
-
- def dump_verbose_config(f)
+ def dump_verbose_config(f=$stdout)
f.puts "HOMEBREW_VERSION: #{HOMEBREW_VERSION}"
f.puts "ORIGIN: #{origin}"
f.puts "HEAD: #{head}"