aboutsummaryrefslogtreecommitdiffstats
path: root/Library/Homebrew
diff options
context:
space:
mode:
authorMisty De Meo2013-12-13 08:28:49 -0800
committerMisty De Meo2013-12-13 08:52:29 -0800
commitae177adb2bd55ee5ad6367e7639c4cf0c774b63a (patch)
treef7546d287d3220bb5c9d80c91a337438821fbe5d /Library/Homebrew
parent674bd61450c4d2fdc7f5a04bf55b66653290f1e9 (diff)
downloadhomebrew-ae177adb2bd55ee5ad6367e7639c4cf0c774b63a.tar.bz2
brew: error out if bad xcode-select path given
Since a bad xcode-select path can cause many brew commands to freeze, it's worth warning users and bailing out as early as possible. The doctor check wasn't good enough, since the doctor could freeze before the warning about this was ever printed.
Diffstat (limited to 'Library/Homebrew')
-rw-r--r--Library/Homebrew/cmd/doctor.rb10
1 files changed, 1 insertions, 9 deletions
diff --git a/Library/Homebrew/cmd/doctor.rb b/Library/Homebrew/cmd/doctor.rb
index e1dbf1678..62d266c08 100644
--- a/Library/Homebrew/cmd/doctor.rb
+++ b/Library/Homebrew/cmd/doctor.rb
@@ -437,15 +437,7 @@ def check_xcode_prefix_exists
end
def check_xcode_select_path
- # with the advent of CLT-only support, we don't need xcode-select
-
- if MacOS::Xcode.bad_xcode_select_path?
- <<-EOS.undent
- Your xcode-select path is set to /
- You must unset it or builds will hang:
- sudo rm /usr/share/xcode-select/xcode_dir_*
- EOS
- elsif not MacOS::CLT.installed? and not File.file? "#{MacOS::Xcode.folder}/usr/bin/xcodebuild"
+ if not MacOS::CLT.installed? and not File.file? "#{MacOS::Xcode.folder}/usr/bin/xcodebuild"
path = MacOS.app_with_bundle_id(MacOS::Xcode::V4_BUNDLE_ID) || MacOS.app_with_bundle_id(MacOS::Xcode::V3_BUNDLE_ID)
path = '/Developer' if path.nil? or not path.directory?
<<-EOS.undent