From f471c3e99fef4bb59c0bbafbfc496eca2850caa2 Mon Sep 17 00:00:00 2001 From: Jack Nagel Date: Fri, 17 Aug 2012 23:21:35 -0500 Subject: [PATCH] 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 --- Library/Homebrew/global.rb | 2 +- Library/Homebrew/macos.rb | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/Library/Homebrew/global.rb b/Library/Homebrew/global.rb index 94b8687b39..066d9335fa 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 cee7902423..696f897a9f 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