diff options
| author | Mike McQuaid | 2017-07-25 13:30:57 +0100 |
|---|---|---|
| committer | GitHub | 2017-07-25 13:30:57 +0100 |
| commit | 9432025800946dd08ecd23e4579eebd3efd2d628 (patch) | |
| tree | a3cf8312d156843fe6d2f7508a1b956294106914 | |
| parent | aa8eb21b8c650a2d0a5a060ff27507da60a17bee (diff) | |
| parent | 76e246059ee4c94fb8a7d0948e25df57f8861e3a (diff) | |
| download | brew-9432025800946dd08ecd23e4579eebd3efd2d628.tar.bz2 | |
Merge pull request #2934 from rwhogg/better-cache-location
Follow the XDG Base Directory specification for caching on Linux
| -rw-r--r-- | Library/Homebrew/brew.sh | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/Library/Homebrew/brew.sh b/Library/Homebrew/brew.sh index 638e9dc19..35e3eaa02 100644 --- a/Library/Homebrew/brew.sh +++ b/Library/Homebrew/brew.sh @@ -110,22 +110,32 @@ then then HOMEBREW_CURL="$HOMEBREW_PREFIX/opt/curl/bin/curl" fi + + if [[ -z "$HOMEBREW_CACHE" ]] + then + HOMEBREW_CACHE="$HOME/Library/Caches/Homebrew" + fi else HOMEBREW_PROCESSOR="$(uname -m)" HOMEBREW_PRODUCT="${HOMEBREW_SYSTEM}brew" [[ -n "$HOMEBREW_LINUX" ]] && HOMEBREW_OS_VERSION="$(lsb_release -sd 2>/dev/null)" : "${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 fi HOMEBREW_USER_AGENT="$HOMEBREW_PRODUCT/$HOMEBREW_USER_AGENT_VERSION ($HOMEBREW_SYSTEM; $HOMEBREW_PROCESSOR $HOMEBREW_OS_USER_AGENT_VERSION)" HOMEBREW_CURL_VERSION="$("$HOMEBREW_CURL" --version 2>/dev/null | head -n1 | /usr/bin/awk '{print $1"/"$2}')" HOMEBREW_USER_AGENT_CURL="$HOMEBREW_USER_AGENT $HOMEBREW_CURL_VERSION" -if [[ -z "$HOMEBREW_CACHE" ]] -then - HOMEBREW_CACHE="$HOME/Library/Caches/Homebrew" -fi - # Declared in bin/brew export HOMEBREW_BREW_FILE export HOMEBREW_PREFIX |