diff options
| author | Jack Nagel | 2012-08-17 23:21:35 -0500 |
|---|---|---|
| committer | Jack Nagel | 2012-08-20 15:00:32 -0500 |
| commit | 94f61e599b7651da630ebbe446ed45e16785b5b7 (patch) | |
| tree | 5d9ec3572f062afeda8bfc4fe022a7bd56ec75b3 /Library | |
| parent | 803535556c3114c0c1f46f7b6dbc0d5b8c370dc2 (diff) | |
| download | homebrew-94f61e599b7651da630ebbe446ed45e16785b5b7.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')
| -rw-r--r-- | Library/Homebrew/global.rb | 2 | ||||
| -rw-r--r-- | 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 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 |