From 66c8f2707c0bd24a356e9fb485c039795d93b246 Mon Sep 17 00:00:00 2001 From: Jack Nagel Date: Tue, 1 Apr 2014 18:40:20 -0500 Subject: [PATCH] Reorganize conditional to avoid shelling out if possible --- Library/brew.rb | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/Library/brew.rb b/Library/brew.rb index 27d66d20fd..484ee3bca3 100755 --- a/Library/brew.rb +++ b/Library/brew.rb @@ -34,8 +34,8 @@ 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 +if OS.mac? && MacOS.version < :mavericks && MacOS::Xcode.bad_xcode_select_path? + odie <<-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: @@ -43,8 +43,6 @@ if OS.mac? && `xcode-select -print-path 2>/dev/null`.chomp == '/' && MacOS.versi Otherwise, you should: sudo rm -rf /usr/share/xcode-select EOS - - exit 1 end case HOMEBREW_PREFIX.to_s when '/', '/usr'