aboutsummaryrefslogtreecommitdiffstats
path: root/Library/Homebrew
diff options
context:
space:
mode:
authorJack Nagel2012-08-17 23:21:35 -0500
committerJack Nagel2012-08-20 15:00:32 -0500
commitf471c3e99fef4bb59c0bbafbfc496eca2850caa2 (patch)
tree4d35177a40ef9a4720daa638f711190cd582d9e2 /Library/Homebrew
parent3f9e88ae69b1ce7c854008b8cbebc38df11b8701 (diff)
downloadbrew-f471c3e99fef4bb59c0bbafbfc496eca2850caa2.tar.bz2
MacOS.dev_tools_path: return nil if not found
This matches the semantics of other path methods, such as Xcode.prefix. Signed-off-by: Jack Nagel <jacknagel@gmail.com>
Diffstat (limited to 'Library/Homebrew')
-rw-r--r--Library/Homebrew/global.rb2
-rw-r--r--Library/Homebrew/macos.rb3
2 files changed, 2 insertions, 3 deletions
diff --git a/Library/Homebrew/global.rb b/Library/Homebrew/global.rb
index 94b8687b3..066d9335f 100644
--- a/Library/Homebrew/global.rb
+++ b/Library/Homebrew/global.rb
@@ -99,5 +99,5 @@ ORIGINAL_PATHS = ENV['PATH'].split(':').map{ |p| Pathname.new(File.expand_path(p
# Xcode-only installs place tools in non-standard locations, and we also want
# to ensure the dev tools are in the PATH in build.rb
unless ORIGINAL_PATHS.include? MacOS.dev_tools_path
- ENV['PATH'] = ENV['PATH'].to_s + ':' + MacOS.dev_tools_path
+ ENV['PATH'] = ENV['PATH'].to_s + ':' + MacOS.dev_tools_path.to_s
end
diff --git a/Library/Homebrew/macos.rb b/Library/Homebrew/macos.rb
index cee790242..696f897a9 100644
--- a/Library/Homebrew/macos.rb
+++ b/Library/Homebrew/macos.rb
@@ -71,8 +71,7 @@ module MacOS extend self
else
# Since we are pretty unrelenting in finding Xcode no matter where
# it hides, we can now throw in the towel.
- opoo "You really should consult the `brew doctor`!"
- ""
+ opoo "Could not locate developer tools. Consult `brew doctor`."
end
end