From c76d652da2ba8baa7718a9a6fe631d79a5e98ff0 Mon Sep 17 00:00:00 2001 From: Adam Vandenberg Date: Tue, 27 Oct 2009 13:27:36 -0700 Subject: [PATCH] Tweak code to locate Cellar path. I think this tweak to finding the Cellar path addresses one of mxcl's concerns over supported install scenarios. --- Library/Homebrew/global.rb | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/Library/Homebrew/global.rb b/Library/Homebrew/global.rb index 07c5f315c9..1ad2963fbe 100644 --- a/Library/Homebrew/global.rb +++ b/Library/Homebrew/global.rb @@ -41,7 +41,15 @@ end HOMEBREW_PREFIX = Pathname.new(BREW_FILE).dirname.parent # Where we link under HOMEBREW_REPOSITORY = Pathname.new(BREW_FILE).realpath.dirname.parent # Where .git is found -HOMEBREW_CELLAR = HOMEBREW_REPOSITORY+'Cellar' # Where we build into + +# Where should be build to? +# If /usr/local/Cellar exists, as a symlink or real folder, use that. +# Otherwise, build into a Cellar in the Repo. folder. +if (HOMEBREW_PREFIX+'Cellar').exist? + HOMEBREW_CELLAR = HOMEBREW_PREFIX+'Cellar' +else + HOMEBREW_CELLAR = HOMEBREW_REPOSITORY+'Cellar' +end MACOS_FULL_VERSION = `/usr/bin/sw_vers -productVersion`.chomp MACOS_VERSION = /(10\.\d+)(\.\d+)?/.match(MACOS_FULL_VERSION).captures.first.to_f