From bcb8fcf6dc7df6a2b60abb9783e468f67e5a5eee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mislav=20Marohni=C4=87?= <mislav.marohnic@gmail.com>
Date: Sat, 21 May 2011 03:38:34 +0200
Subject: [PATCH] fix `doctor` command in case Cellar dir doesn't yet exist
Signed-off-by: Adam Vandenberg <flangy@gmail.com>
---
Library/Homebrew/cmd/doctor.rb | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/Library/Homebrew/cmd/doctor.rb b/Library/Homebrew/cmd/doctor.rb
index c152c07d0a..ddaffeb864 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
--
GitLab