From 7260b35c311cc78371f1e984ce78302b0a565d91 Mon Sep 17 00:00:00 2001 From: Mike McQuaid Date: Wed, 27 Jan 2016 10:29:58 +0000 Subject: [PATCH] config: fail when HOMEBREW_BREW_FILE is unset. Not sure why this is happening (beyond the Chef cookbook stupidly deciding to not call through `bin/brew`) but fail and print a scary looking error to hope to point people in the right direction. Closes Homebrew/homebrew#48261. Signed-off-by: Mike McQuaid --- Library/Homebrew/config.rb | 5 +++-- Library/brew.rb | 2 -- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/Library/Homebrew/config.rb b/Library/Homebrew/config.rb index 692a43988c..85c4713285 100644 --- a/Library/Homebrew/config.rb +++ b/Library/Homebrew/config.rb @@ -26,8 +26,9 @@ undef cache # Where brews installed via URL are cached HOMEBREW_CACHE_FORMULA = HOMEBREW_CACHE+"Formula" -unless defined? HOMEBREW_BREW_FILE - HOMEBREW_BREW_FILE = ENV["HOMEBREW_BREW_FILE"] || which("brew").to_s +HOMEBREW_BREW_FILE = ENV["HOMEBREW_BREW_FILE"] +unless HOMEBREW_BREW_FILE + odie "HOMEBREW_BREW_FILE was not exported! Please call bin/brew directly!" end # Where we link under diff --git a/Library/brew.rb b/Library/brew.rb index 36dd901a57..754102c2ab 100755 --- a/Library/brew.rb +++ b/Library/brew.rb @@ -2,8 +2,6 @@ std_trap = trap("INT") { exit! 130 } # no backtrace thanks -HOMEBREW_BREW_FILE = ENV["HOMEBREW_BREW_FILE"] - require "pathname" HOMEBREW_LIBRARY_PATH = Pathname.new(__FILE__).realpath.parent.join("Homebrew") $:.unshift(HOMEBREW_LIBRARY_PATH.to_s)