From c30665afa62c4f8fc8d776f121967dc6d6bf1ba7 Mon Sep 17 00:00:00 2001 From: Mike McQuaid <mike@mikemcquaid.com> Date: Mon, 19 Sep 2016 14:12:44 +0100 Subject: [PATCH] brew.sh: fix repository auto-update change. On auto-update `HOMEBREW_LIBRARY` may change location which means that it won't be found for the actual install command. Look for this having occurred and then set the new `HOMEBREW_LIBRARY` (and `HOMEBREW_REPOSITORY`) accordingly. --- Library/Homebrew/brew.sh | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/Library/Homebrew/brew.sh b/Library/Homebrew/brew.sh index 0fadecaba3..d33cc8678d 100644 --- a/Library/Homebrew/brew.sh +++ b/Library/Homebrew/brew.sh @@ -268,6 +268,17 @@ update-preinstall() { brew update --preinstall fi + # If brew update --preinstall did a migration then export the new locations. + if [[ "$HOMEBREW_REPOSITORY" = "/usr/local" && + ! -d "$HOMEBREW_REPOSITORY/.git" && + -d "/usr/local/Homebrew/.git" ]] + then + HOMEBREW_REPOSITORY="/usr/local/Homebrew" + HOMEBREW_LIBRARY="$HOMEBREW_REPOSITORY/Library" + export HOMEBREW_REPOSITORY + export HOMEBREW_LIBRARY + fi + # If we've checked for updates, we don't need to check again. export HOMEBREW_NO_AUTO_UPDATE="1" } -- GitLab