Improve HOMEBREW_BREW_FILE unset failure case.

Print a better exception message and handle this in more cases rather
than producing confusing errors when it’s unset.
This commit is contained in:
Mike McQuaid 2016-08-24 14:46:05 +01:00
parent 8d79cf1eb6
commit e7984b34d5
3 changed files with 13 additions and 5 deletions

View File

@ -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 std_trap = trap("INT") { exit! 130 } # no backtrace thanks
# check ruby version before requiring any modules. # check ruby version before requiring any modules.

View File

@ -1,10 +1,10 @@
if ENV["HOMEBREW_BREW_FILE"] unless ENV["HOMEBREW_BREW_FILE"]
# Path to `bin/brew` main executable in {HOMEBREW_PREFIX} raise "HOMEBREW_BREW_FILE was not exported! Please call bin/brew directly!"
HOMEBREW_BREW_FILE = Pathname.new(ENV["HOMEBREW_BREW_FILE"])
else
odie "HOMEBREW_BREW_FILE was not exported! Please call bin/brew directly!"
end end
# Path to `bin/brew` main executable in HOMEBREW_PREFIX
HOMEBREW_BREW_FILE = Pathname.new(ENV["HOMEBREW_BREW_FILE"])
# Where we link under # Where we link under
HOMEBREW_PREFIX = Pathname.new(ENV["HOMEBREW_PREFIX"]) HOMEBREW_PREFIX = Pathname.new(ENV["HOMEBREW_PREFIX"])

View File

@ -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 "tmpdir"
require "pathname" require "pathname"