diff options
| -rw-r--r-- | Library/Homebrew/cmd/--config.rb | 19 | ||||
| -rwxr-xr-x | Library/brew.rb | 8 |
2 files changed, 3 insertions, 24 deletions
diff --git a/Library/Homebrew/cmd/--config.rb b/Library/Homebrew/cmd/--config.rb index cb1409b50..a6df1a2c6 100644 --- a/Library/Homebrew/cmd/--config.rb +++ b/Library/Homebrew/cmd/--config.rb @@ -2,11 +2,7 @@ require 'hardware' module Homebrew extend self def __config - if ARGV.first == '-1' - dump_c1 - else - dump_verbose_config - end + dump_verbose_config end def llvm @@ -150,17 +146,4 @@ module Homebrew extend self puts "Python: #{describe_python}" puts "Ruby: #{describe_ruby}" end - - def dump_c1 - print "#{HOMEBREW_PREFIX}-#{HOMEBREW_VERSION} " - print MACOS_FULL_VERSION - print "-#{kernel}" if MacOS.version < :lion - print ' ' - print MacOS::Xcode.prefix unless MacOS::Xcode.default_prefix? - print "#{MacOS::Xcode.version}" - print "-noclt" unless MacOS::CLT.installed? - print " clang-#{clang_build} llvm-#{llvm} " - print "#{MacOS::XQuartz.prefix}-#{MacOS::XQuartz.version}" if MacOS::XQuartz.prefix - puts - end end diff --git a/Library/brew.rb b/Library/brew.rb index dad310e84..4fa22b4ee 100755 --- a/Library/brew.rb +++ b/Library/brew.rb @@ -70,17 +70,13 @@ begin 'abv' => 'info', 'dr' => 'doctor', '--repo' => '--repository', - 'environment' => '--env' # same as gem + 'environment' => '--env', + '-c1' => '--config', } cmd = ARGV.shift cmd = aliases[cmd] if aliases[cmd] - if cmd == '-c1' # Shortcut for one line of configuration - cmd = '--config' - ARGV.unshift('-1') - end - sudo_check = Set.new %w[ install link pin unpin upgrade ] if sudo_check.include? cmd |