admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

config: fail when HOMEBREW_BREW_FILE is unset.

Browse Source 
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 <mike@mikemcquaid.com>
This commit is contained in:
Mike McQuaid 2016-01-27 10:29:58 +00:00
parent e07b5a98e0
commit 7260b35c31
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Library/Homebrew/config.rb
View File

@ -26,8 +26,9 @@ undef cache
# Where brews installed via URL are cached # Where brews installed via URL are cached
HOMEBREW_CACHE_FORMULA = HOMEBREW_CACHE+"Formula" HOMEBREW_CACHE_FORMULA = HOMEBREW_CACHE+"Formula"
unless defined? HOMEBREW_BREW_FILE HOMEBREW_BREW_FILE = ENV["HOMEBREW_BREW_FILE"]
HOMEBREW_BREW_FILE = ENV["HOMEBREW_BREW_FILE"] || which("brew").to_s unless HOMEBREW_BREW_FILE
odie "HOMEBREW_BREW_FILE was not exported! Please call bin/brew directly!"
end end
# Where we link under # Where we link under

2
Library/brew.rb
View File

@ -2,8 +2,6 @@
std_trap = trap("INT") { exit! 130 } # no backtrace thanks std_trap = trap("INT") { exit! 130 } # no backtrace thanks
HOMEBREW_BREW_FILE = ENV["HOMEBREW_BREW_FILE"]
require "pathname" require "pathname"
HOMEBREW_LIBRARY_PATH = Pathname.new(__FILE__).realpath.parent.join("Homebrew") HOMEBREW_LIBRARY_PATH = Pathname.new(__FILE__).realpath.parent.join("Homebrew")
$:.unshift(HOMEBREW_LIBRARY_PATH.to_s) $:.unshift(HOMEBREW_LIBRARY_PATH.to_s)