diff options
| author | Mike McQuaid | 2016-11-05 09:55:37 -0400 |
|---|---|---|
| committer | GitHub | 2016-11-05 09:55:37 -0400 |
| commit | 3cef6a3a78fb9d300b6d7db4cf9a389c1af4ce8b (patch) | |
| tree | d7fcaaaab2f5a9726fb6fb0f4e80e2da88e6c91f /Library | |
| parent | 297c60059c1e4a280d414593936e9784f9c0dfa9 (diff) | |
| parent | 0ca697ad2f5e937f5cd613b1a17a90b126a1a00b (diff) | |
| download | brew-3cef6a3a78fb9d300b6d7db4cf9a389c1af4ce8b.tar.bz2 | |
Merge pull request #1413 from zmwangx/update-preinstall-message
brew.sh: display message when auto update runs for too long
Diffstat (limited to 'Library')
| -rw-r--r-- | Library/Homebrew/brew.sh | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/Library/Homebrew/brew.sh b/Library/Homebrew/brew.sh index f3bb605bb..8a6ceff8f 100644 --- a/Library/Homebrew/brew.sh +++ b/Library/Homebrew/brew.sh @@ -296,6 +296,13 @@ source "$HOMEBREW_LIBRARY/Homebrew/utils/analytics.sh" setup-analytics report-analytics-screenview-command +# Let user know we're still updating Homebrew if brew update --preinstall +# exceeds 3 seconds. +update-preinstall-timer() { + sleep 3 + echo 'Updating Homebrew...' >&2 +} + update-preinstall() { [[ -z "$HOMEBREW_HELP" ]] || return [[ -z "$HOMEBREW_NO_AUTO_UPDATE" ]] || return @@ -306,7 +313,19 @@ update-preinstall() { if [[ "$HOMEBREW_COMMAND" = "install" || "$HOMEBREW_COMMAND" = "upgrade" || "$HOMEBREW_COMMAND" = "tap" ]] then + if [[ -z "$HOMEBREW_VERBOSE" ]] + then + update-preinstall-timer & + timer_pid=$! + fi + brew update --preinstall + + if [[ -n "$timer_pid" ]] + then + kill "$timer_pid" 2>/dev/null + wait "$timer_pid" 2>/dev/null + fi fi # If brew update --preinstall did a migration then export the new locations. |