From e7984b34d5216e5bb2ee6ee6caf56068e06a6ae2 Mon Sep 17 00:00:00 2001
From: Mike McQuaid <mike@mikemcquaid.com>
Date: Wed, 24 Aug 2016 14:46:05 +0100
Subject: [PATCH] Improve HOMEBREW_BREW_FILE unset failure case.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Print a better exception message and handle this in more cases rather
than producing confusing errors when it’s unset.
---
 Library/Homebrew/brew.rb            |  4 ++++
 Library/Homebrew/config.rb          | 10 +++++-----
 Library/Homebrew/test/lib/config.rb |  4 ++++
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/Library/Homebrew/brew.rb b/Library/Homebrew/brew.rb
index d4e348c3f0..78c8ee5f5b 100644
--- a/Library/Homebrew/brew.rb
+++ b/Library/Homebrew/brew.rb
@@ -1,3 +1,7 @@
+unless ENV["HOMEBREW_BREW_FILE"]
+  raise "HOMEBREW_BREW_FILE was not exported! Please call bin/brew directly!"
+end
+
 std_trap = trap("INT") { exit! 130 } # no backtrace thanks
 
 # check ruby version before requiring any modules.
diff --git a/Library/Homebrew/config.rb b/Library/Homebrew/config.rb
index 70a2386a92..cef6153654 100644
--- a/Library/Homebrew/config.rb
+++ b/Library/Homebrew/config.rb
@@ -1,10 +1,10 @@
-if ENV["HOMEBREW_BREW_FILE"]
-  # Path to `bin/brew` main executable in {HOMEBREW_PREFIX}
-  HOMEBREW_BREW_FILE = Pathname.new(ENV["HOMEBREW_BREW_FILE"])
-else
-  odie "HOMEBREW_BREW_FILE was not exported! Please call bin/brew directly!"
+unless ENV["HOMEBREW_BREW_FILE"]
+  raise "HOMEBREW_BREW_FILE was not exported! Please call bin/brew directly!"
 end
 
+# Path to `bin/brew` main executable in HOMEBREW_PREFIX
+HOMEBREW_BREW_FILE = Pathname.new(ENV["HOMEBREW_BREW_FILE"])
+
 # Where we link under
 HOMEBREW_PREFIX = Pathname.new(ENV["HOMEBREW_PREFIX"])
 
diff --git a/Library/Homebrew/test/lib/config.rb b/Library/Homebrew/test/lib/config.rb
index 742d8e0a0a..713bc9c3a4 100644
--- a/Library/Homebrew/test/lib/config.rb
+++ b/Library/Homebrew/test/lib/config.rb
@@ -1,3 +1,7 @@
+unless ENV["HOMEBREW_BREW_FILE"]
+  raise "HOMEBREW_BREW_FILE was not exported! Please call bin/brew directly!"
+end
+
 require "tmpdir"
 require "pathname"