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

Address review comments.

Browse Source
This commit is contained in:
Maxim Belkin 2020-11-24 20:59:46 -06:00
parent 2b6c1e220d
commit 82ad6a56e9
No known key found for this signature in database
GPG Key ID: AC71560D4C5F2338
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -368,12 +368,14 @@ user account:
EOS EOS
fi fi
set -e
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" ohai "Installing Homebrew cURL"
brew install curl if [[ -d "$HOMEBREW_LIBRARY/Taps/homebrew/homebrew-core" ]] && ! brew install curl
then
odie "Curl must be installed and in your PATH!"
fi
fi fi
if ! git --version &>/dev/null || if ! git --version &>/dev/null ||
@ -381,14 +383,14 @@ EOS
! -x "$HOMEBREW_PREFIX/opt/git/bin/git" ]] ! -x "$HOMEBREW_PREFIX/opt/git/bin/git" ]]
then then
ohai "Installing Homebrew Git" ohai "Installing Homebrew Git"
brew install git [[ -d "$HOMEBREW_LIBRARY/Taps/homebrew/homebrew-core" ]] && brew install git
unset GIT_EXECUTABLE unset GIT_EXECUTABLE
if ! git --version &>/dev/null if ! git --version &>/dev/null
then then
odie "Git must be installed and in your PATH!" odie "Git must be installed and in your PATH!"
fi fi
fi fi
set +e
export GIT_TERMINAL_PROMPT="0" export GIT_TERMINAL_PROMPT="0"
export GIT_SSH_COMMAND="ssh -oBatchMode=yes" export GIT_SSH_COMMAND="ssh -oBatchMode=yes"