diff --git a/Library/Homebrew/brew.sh b/Library/Homebrew/brew.sh index 166b816e41..727119d9bd 100644 --- a/Library/Homebrew/brew.sh +++ b/Library/Homebrew/brew.sh @@ -104,10 +104,9 @@ then HOMEBREW_FORCE_BREWED_GIT="1" fi - if [[ -z "$HOMEBREW_CACHE" ]] - then - HOMEBREW_CACHE="$HOME/Library/Caches/Homebrew" - fi + HOMEBREW_CACHE="${HOMEBREW_CACHE:-${HOME}/Library/Caches/Homebrew}" + + HOMEBREW_TEMP="${HOMEBREW_TEMP:-/private/tmp}" else HOMEBREW_PROCESSOR="$(uname -m)" HOMEBREW_PRODUCT="${HOMEBREW_SYSTEM}brew" @@ -115,15 +114,10 @@ else : "${HOMEBREW_OS_VERSION:=$(uname -r)}" HOMEBREW_OS_USER_AGENT_VERSION="$HOMEBREW_OS_VERSION" - if [[ -z "$HOMEBREW_CACHE" ]] - then - if [[ -n "$XDG_CACHE_HOME" ]] - then - HOMEBREW_CACHE="$XDG_CACHE_HOME/Homebrew" - else - HOMEBREW_CACHE="$HOME/.cache/Homebrew" - fi - fi + CACHE_HOME="${XDG_CACHE_HOME:-${HOME}/.cache}" + HOMEBREW_CACHE="${HOMEBREW_CACHE:-${CACHE_HOME}/Homebrew}" + + HOMEBREW_TEMP="${HOMEBREW_TEMP:-/tmp}" fi if [[ -n "$HOMEBREW_FORCE_BREWED_CURL" && @@ -153,6 +147,7 @@ export HOMEBREW_BREW_FILE export HOMEBREW_PREFIX export HOMEBREW_REPOSITORY export HOMEBREW_LIBRARY +export HOMEBREW_TEMP # Declared in brew.sh export HOMEBREW_VERSION @@ -309,6 +304,21 @@ EOS } check-run-command-as-root +check-prefix-is-not-tmpdir() { + [[ -z "${HOMEBREW_MACOS}" ]] && return + + if [[ "${HOMEBREW_PREFIX}" = "${HOMEBREW_TEMP}"* ]] + then + odie <