aboutsummaryrefslogtreecommitdiffstats
path: root/Library
diff options
context:
space:
mode:
authorJack Nagel2012-07-12 03:10:57 -0500
committerJack Nagel2012-07-25 12:04:42 -0500
commit6d528e94bbde27a9f9a99ca46b9bedf6bdb3e8cd (patch)
treed3c6430dac4451295d86e569bf3d61fabc84d2b4 /Library
parenta18f853679fd7755b280f99bd8cbb86ef9e9ca54 (diff)
downloadhomebrew-6d528e94bbde27a9f9a99ca46b9bedf6bdb3e8cd.tar.bz2
Rename xctools_fucked?
Signed-off-by: Jack Nagel <jacknagel@gmail.com>
Diffstat (limited to 'Library')
-rw-r--r--Library/Homebrew/cmd/doctor.rb2
-rw-r--r--Library/Homebrew/macos.rb6
-rw-r--r--Library/Homebrew/xcode.rb4
3 files changed, 6 insertions, 6 deletions
diff --git a/Library/Homebrew/cmd/doctor.rb b/Library/Homebrew/cmd/doctor.rb
index 6e64843a8..25c5ec7d2 100644
--- a/Library/Homebrew/cmd/doctor.rb
+++ b/Library/Homebrew/cmd/doctor.rb
@@ -402,7 +402,7 @@ end
def check_xcode_select_path
# with the advent of CLT-only support, we don't need xcode-select
return if MacOS::CLT.installed?
- unless File.file? "#{MacOS::Xcode.folder}/usr/bin/xcodebuild" and not MacOS::Xcode.xctools_fucked?
+ unless File.file? "#{MacOS::Xcode.folder}/usr/bin/xcodebuild" and not MacOS::Xcode.bad_xcode_select_path?
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
diff --git a/Library/Homebrew/macos.rb b/Library/Homebrew/macos.rb
index 5a1302a9d..21c3bc7af 100644
--- a/Library/Homebrew/macos.rb
+++ b/Library/Homebrew/macos.rb
@@ -36,7 +36,7 @@ module MacOS extend self
else
# Xcrun was provided first with Xcode 4.3 and allows us to proxy
# tool usage thus avoiding various bugs.
- p = `/usr/bin/xcrun -find #{tool} 2>/dev/null`.chomp unless Xcode.xctools_fucked?
+ p = `/usr/bin/xcrun -find #{tool} 2>/dev/null`.chomp unless Xcode.bad_xcode_select_path?
if !p.nil? and !p.empty? and File.executable? p
path = Pathname.new p
else
@@ -67,7 +67,7 @@ module MacOS extend self
@dev_tools_path ||= if File.exist? "/usr/bin/cc" and File.exist? "/usr/bin/make"
# probably a safe enough assumption (the unix way)
Pathname.new "/usr/bin"
- elsif not Xcode.xctools_fucked? and system "/usr/bin/xcrun -find make 1>/dev/null 2>&1"
+ elsif not Xcode.bad_xcode_select_path? and system "/usr/bin/xcrun -find make 1>/dev/null 2>&1"
# Wherever "make" is there are the dev tools.
Pathname.new(`/usr/bin/xcrun -find make`.chomp).dirname
elsif File.exist? "#{Xcode.prefix}/usr/bin/make"
@@ -93,7 +93,7 @@ module MacOS extend self
def sdk_path v=version
@sdk_path ||= begin
- path = if not Xcode.xctools_fucked? and File.executable? "#{Xcode.folder}/usr/bin/make"
+ path = if not Xcode.bad_xcode_select_path? and File.executable? "#{Xcode.folder}/usr/bin/make"
`#{locate('xcodebuild')} -version -sdk macosx#{v} Path 2>/dev/null`.strip
elsif File.directory? '/Developer/SDKs/MacOS#{v}.sdk'
# the old default (or wild wild west style)
diff --git a/Library/Homebrew/xcode.rb b/Library/Homebrew/xcode.rb
index ab3062ed0..0c8139c62 100644
--- a/Library/Homebrew/xcode.rb
+++ b/Library/Homebrew/xcode.rb
@@ -12,7 +12,7 @@ module MacOS::Xcode extend self
end
# Xcode 4.3 tools hang if "/" is set
- def xctools_fucked?
+ def bad_xcode_select_path?
folder == "/"
end
@@ -68,7 +68,7 @@ module MacOS::Xcode extend self
end
# Xcode 4.3 xc* tools hang indefinately if xcode-select path is set thus
- raise if xctools_fucked?
+ raise if bad_xcode_select_path?
raise unless which "xcodebuild"
`xcodebuild -version 2>/dev/null` =~ /Xcode (\d(\.\d)*)/