From effca7d9c60495f7c5c21af637da4e0e2952f66e Mon Sep 17 00:00:00 2001
From: Mike McQuaid
Date: Fri, 25 Dec 2015 22:42:00 +0000
Subject: bin/brew: set more HOMEBREW_* env from Bash.

---
 Library/Homebrew/config.rb | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

(limited to 'Library')

diff --git a/Library/Homebrew/config.rb b/Library/Homebrew/config.rb
index 57cf19283..692a43988 100644
--- a/Library/Homebrew/config.rb
+++ b/Library/Homebrew/config.rb
@@ -31,21 +31,16 @@ unless defined? HOMEBREW_BREW_FILE
 end
 
 # Where we link under
-HOMEBREW_PREFIX = Pathname.new(HOMEBREW_BREW_FILE).dirname.parent
+HOMEBREW_PREFIX = Pathname.new(ENV["HOMEBREW_PREFIX"])
 
 # Where .git is found
-HOMEBREW_REPOSITORY = Pathname.new(HOMEBREW_BREW_FILE).realpath.dirname.parent
+HOMEBREW_REPOSITORY = Pathname.new(ENV["HOMEBREW_REPOSITORY"])
 
-HOMEBREW_LIBRARY = HOMEBREW_REPOSITORY/"Library"
+HOMEBREW_LIBRARY = Pathname.new(ENV["HOMEBREW_LIBRARY"])
 HOMEBREW_CONTRIB = HOMEBREW_REPOSITORY/"Library/Contributions"
 
-# Where we store built products; /usr/local/Cellar if it exists,
-# otherwise a Cellar relative to the Repository.
-HOMEBREW_CELLAR = if (HOMEBREW_PREFIX+"Cellar").exist?
-  HOMEBREW_PREFIX+"Cellar"
-else
-  HOMEBREW_REPOSITORY+"Cellar"
-end
+# Where we store built products
+HOMEBREW_CELLAR = Pathname.new(ENV["HOMEBREW_CELLAR"])
 
 HOMEBREW_LOGS = Pathname.new(ENV["HOMEBREW_LOGS"] || "~/Library/Logs/Homebrew/").expand_path
 
-- 
cgit v1.2.3