admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

Xcode.bad_xcode_select_path? is used only once, so inline it

Browse Source
This commit is contained in:
Jack Nagel 2014-04-15 11:28:52 -05:00
parent a55e670a8a
commit 20c150fb8c
2 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Library/Homebrew/os/mac/xcode.rb
View File

@ -14,11 +14,6 @@ module OS
@folder ||= `xcode-select -print-path 2>/dev/null`.strip @folder ||= `xcode-select -print-path 2>/dev/null`.strip
end end
# Xcode 4.3 tools hang if "/" is set
def bad_xcode_select_path?
folder == "/"
end
def latest_version def latest_version
case MacOS.version case MacOS.version
when "10.4" then "2.5" when "10.4" then "2.5"

2
Library/brew.rb
View File

@ -34,7 +34,7 @@ end
# Check for bad xcode-select before anything else, because `doctor` and # Check for bad xcode-select before anything else, because `doctor` and
# many other things will hang # many other things will hang
# Note that this bug was fixed in 10.9 # Note that this bug was fixed in 10.9
if OS.mac? && MacOS.version < :mavericks && MacOS::Xcode.bad_xcode_select_path? if OS.mac? && MacOS.version < :mavericks && MacOS::Xcode.folder == "/"
odie <<-EOS.undent odie <<-EOS.undent
Your xcode-select path is currently set to '/'. Your xcode-select path is currently set to '/'.
This causes the `xcrun` tool to hang, and can render Homebrew unusable. This causes the `xcrun` tool to hang, and can render Homebrew unusable.