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

Apply Mike's suggestions

Browse Source 
Co-authored-by: Mike McQuaid <mike@mikemcquaid.com>
This commit is contained in:
Maxim Belkin 2020-11-25 12:54:18 -06:00 committed by GitHub
parent fd08ffdd67
commit c3231a4095
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Library/Homebrew/cmd/update.sh
View File

@ -368,10 +368,11 @@ user account:
EOS EOS
fi fi
# we may want to use a Homebrew curl
if [[ -n "$HOMEBREW_FORCE_BREWED_CURL" && if [[ -n "$HOMEBREW_FORCE_BREWED_CURL" &&
! -x "$HOMEBREW_PREFIX/opt/curl/bin/curl" ]] ! -x "$HOMEBREW_PREFIX/opt/curl/bin/curl" ]]
then then
ohai "Installing Homebrew cURL" # we cannot install a Homebrew cURL if homebrew/core is unavailable.
if [[ -d "$HOMEBREW_LIBRARY/Taps/homebrew/homebrew-core" ]] && ! brew install curl if [[ -d "$HOMEBREW_LIBRARY/Taps/homebrew/homebrew-core" ]] && ! brew install curl
then then
odie "Curl must be installed and in your PATH!" odie "Curl must be installed and in your PATH!"
@ -382,7 +383,7 @@ EOS
[[ -n "$HOMEBREW_FORCE_BREWED_GIT" && [[ -n "$HOMEBREW_FORCE_BREWED_GIT" &&
! -x "$HOMEBREW_PREFIX/opt/git/bin/git" ]] ! -x "$HOMEBREW_PREFIX/opt/git/bin/git" ]]
then then
ohai "Installing Homebrew Git" # we cannot install a Homebrew Git if homebrew/core is unavailable.
if [[ -d "$HOMEBREW_LIBRARY/Taps/homebrew/homebrew-core" ]] && ! brew install git if [[ -d "$HOMEBREW_LIBRARY/Taps/homebrew/homebrew-core" ]] && ! brew install git
then then
odie "Git must be installed and in your PATH!" odie "Git must be installed and in your PATH!"