diff options
| author | Jack Nagel | 2014-04-15 11:28:52 -0500 |
|---|---|---|
| committer | Jack Nagel | 2014-04-15 11:28:52 -0500 |
| commit | 20c150fb8c6d861a40473348870a7c7a3f4e7f2f (patch) | |
| tree | f7af1d96d0a8dc6c86feee0d525f2291b226621a /Library | |
| parent | a55e670a8ad6f9655394cae216eab5fa96c9c9fa (diff) | |
| download | brew-20c150fb8c6d861a40473348870a7c7a3f4e7f2f.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. |
