diff options
| author | Misty De Meo | 2013-12-13 10:46:30 -0800 |
|---|---|---|
| committer | Misty De Meo | 2013-12-13 19:17:56 -0800 |
| commit | 5994fd469cd8561814d84076f3f1d268b1242c98 (patch) | |
| tree | 0f399d2473ccb09a9229f7351cdb4053ccbb4d4e /Library | |
| parent | 856266432daf7bb69d573b5efde533b301061730 (diff) | |
| download | brew-5994fd469cd8561814d84076f3f1d268b1242c98.tar.bz2 | |
xcode-select check: move after first options
Diffstat (limited to 'Library')
| -rwxr-xr-x | Library/brew.rb | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/Library/brew.rb b/Library/brew.rb index 0710f6bec..455f30464 100755 --- a/Library/brew.rb +++ b/Library/brew.rb @@ -16,22 +16,6 @@ $:.unshift(HOMEBREW_LIBRARY_PATH + '/vendor') $:.unshift(HOMEBREW_LIBRARY_PATH) require 'global' -# Check for bad xcode-select before anything else, because `doctor` and -# many other things will hang -# Note that this bug was fixed in 10.9 -if `xcode-select -print-path 2>/dev/null`.chomp == '/' && MacOS.version < :mavericks - ofail <<-EOS.undent - Your xcode-select path is currently set to '/'. - This causes the `xcrun` tool to hang, and can render Homebrew unusable. - If you are using Xcode, you should: - sudo xcode-select -switch /Applications/Xcode.app - Otherwise, you should: - sudo rm -rf /usr/share/xcode-select - EOS - - exit 1 -end - case ARGV.first when '-h', '--help', '--usage', '-?', 'help', nil require 'cmd/help' puts Homebrew.help_s @@ -47,6 +31,22 @@ when '-v' exit 0 if ARGV.length == 1 end +# Check for bad xcode-select before anything else, because `doctor` and +# many other things will hang +# Note that this bug was fixed in 10.9 +if OS.mac? && `xcode-select -print-path 2>/dev/null`.chomp == '/' && MacOS.version < :mavericks + ofail <<-EOS.undent + Your xcode-select path is currently set to '/'. + This causes the `xcrun` tool to hang, and can render Homebrew unusable. + If you are using Xcode, you should: + sudo xcode-select -switch /Applications/Xcode.app + Otherwise, you should: + sudo rm -rf /usr/share/xcode-select + EOS + + exit 1 +end + case HOMEBREW_PREFIX.to_s when '/', '/usr' # it may work, but I only see pain this route and don't want to support it abort "Cowardly refusing to continue at this prefix: #{HOMEBREW_PREFIX}" |
