aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMislav Marohnić2011-05-21 03:38:34 +0200
committerAdam Vandenberg2011-06-03 21:15:55 -0700
commitbcb8fcf6dc7df6a2b60abb9783e468f67e5a5eee (patch)
treed29a4c5ab5dd294bd96e87dac7959fcbd50355d4
parent884048c52a8cf9c9a66921f16f365768d2c407b7 (diff)
downloadbrew-bcb8fcf6dc7df6a2b60abb9783e468f67e5a5eee.tar.bz2
fix `doctor` command in case Cellar dir doesn't yet exist
Signed-off-by: Adam Vandenberg <flangy@gmail.com>
-rw-r--r--Library/Homebrew/cmd/doctor.rb5
1 files changed, 3 insertions, 2 deletions
diff --git a/Library/Homebrew/cmd/doctor.rb b/Library/Homebrew/cmd/doctor.rb
index c152c07d0..ddaffeb86 100644
--- a/Library/Homebrew/cmd/doctor.rb
+++ b/Library/Homebrew/cmd/doctor.rb
@@ -441,13 +441,13 @@ def check_for_iconv
end
def check_for_config_scripts
- real_cellar = HOMEBREW_CELLAR.realpath
+ real_cellar = HOMEBREW_CELLAR.exist? && HOMEBREW_CELLAR.realpath
config_scripts = []
path_folders.each do |p|
next if ['/usr/bin', '/usr/sbin', '/usr/X11/bin', "#{HOMEBREW_PREFIX}/bin", "#{HOMEBREW_PREFIX}/sbin"].include? p
- next if p =~ %r[^(#{real_cellar.to_s}|#{HOMEBREW_CELLAR.to_s})]
+ next if p =~ %r[^(#{real_cellar.to_s}|#{HOMEBREW_CELLAR.to_s})] if real_cellar
configs = Dir["#{p}/*-config"]
# puts "#{p}\n #{configs * ' '}" unless configs.empty?
@@ -504,6 +504,7 @@ def check_for_symlinked_cellar
end
def check_for_multiple_volumes
+ return unless HOMEBREW_CELLAR.exist?
volumes = Volumes.new
# Find the volumes for the TMP folder & HOMEBREW_CELLAR