diff options
| author | Jack Nagel | 2014-04-15 11:28:52 -0500 |
|---|---|---|
| committer | Jack Nagel | 2014-04-15 11:28:52 -0500 |
| commit | 3895241da989c9e0f0230ed1c1b5d07d9fb99126 (patch) | |
| tree | aec9277422548e9862f6d8cbc86ae478f30da4dc /Library | |
| parent | f4f04cc2ec981fdf257d177bd42f8dfcfab158d6 (diff) | |
| download | homebrew-3895241da989c9e0f0230ed1c1b5d07d9fb99126.tar.bz2 | |
Xcode.bad_xcode_select_path? is used only once, so inline it
Diffstat (limited to 'Library')
| -rw-r--r-- | Library/Homebrew/os/mac/xcode.rb | 5 | ||||
| -rwxr-xr-x | Library/brew.rb | 2 |
2 files changed, 1 insertions, 6 deletions
diff --git a/Library/Homebrew/os/mac/xcode.rb b/Library/Homebrew/os/mac/xcode.rb index b7447d4e3..cb19eaf8a 100644 --- a/Library/Homebrew/os/mac/xcode.rb +++ b/Library/Homebrew/os/mac/xcode.rb @@ -14,11 +14,6 @@ module OS @folder ||= `xcode-select -print-path 2>/dev/null`.strip end - # Xcode 4.3 tools hang if "/" is set - def bad_xcode_select_path? - folder == "/" - end - def latest_version case MacOS.version when "10.4" then "2.5" diff --git a/Library/brew.rb b/Library/brew.rb index 5b2bc1ccf..a27497912 100755 --- a/Library/brew.rb +++ b/Library/brew.rb @@ -34,7 +34,7 @@ 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? && MacOS.version < :mavericks && MacOS::Xcode.bad_xcode_select_path? +if OS.mac? && MacOS.version < :mavericks && MacOS::Xcode.folder == "/" odie <<-EOS.undent Your xcode-select path is currently set to '/'. This causes the `xcrun` tool to hang, and can render Homebrew unusable. |
