Skip to content
Snippets Groups Projects
Commit a7c29271 authored by Mike McQuaid's avatar Mike McQuaid
Browse files

CLT: rename Mavericks CLT path constant.

parent 5568f185
No related branches found
No related tags found
No related merge requests found
......@@ -51,9 +51,8 @@ module OS
end
def dev_tools_path
@dev_tools_path ||= if tools_in_prefix? CLT::STANDALONE_PKG_PATH
# In 10.9 the CLT moved from /usr into /Library/Developer/CommandLineTools.
Pathname.new "#{CLT::STANDALONE_PKG_PATH}/usr/bin"
@dev_tools_path ||= if tools_in_prefix? CLT::MAVERICKS_PKG_PATH
Pathname.new "#{CLT::MAVERICKS_PKG_PATH}/usr/bin"
elsif tools_in_prefix? "/"
# probably a safe enough assumption (the unix way)
Pathname.new "/usr/bin"
......
......@@ -163,7 +163,7 @@ module OS
STANDALONE_PKG_ID = "com.apple.pkg.DeveloperToolsCLILeo"
FROM_XCODE_PKG_ID = "com.apple.pkg.DeveloperToolsCLI"
STANDALONE_PKG_PATH = Pathname.new("/Library/Developer/CommandLineTools")
MAVERICKS_PKG_PATH = Pathname.new("/Library/Developer/CommandLineTools")
# True if:
# - Xcode < 4.3 is installed. The tools are found under /usr.
......@@ -175,8 +175,8 @@ module OS
end
def mavericks_dev_tools?
MacOS.dev_tools_path == Pathname("#{STANDALONE_PKG_PATH}/usr/bin") &&
File.directory?("#{STANDALONE_PKG_PATH}/usr/include")
MacOS.dev_tools_path == Pathname("#{MAVERICKS_PKG_PATH}/usr/bin") &&
File.directory?("#{MAVERICKS_PKG_PATH}/usr/include")
end
def usr_dev_tools?
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment