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

Document HOMEBREW_CURL_PATH and HOMEBREW_GIT_PATH

Browse Source 
- document both these variables in `man brew`
- allow them to be used on Linux without `HOMEBREW_DEVELOPER`
This commit is contained in:
Mike McQuaid 2022-06-14 10:33:30 +01:00
parent f802815474
commit 77203e0760
No known key found for this signature in database
GPG Key ID: 3338A31AFDB1D829
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Library/Homebrew/brew.sh
View File

@ -373,7 +373,7 @@ setup_curl() {
"${HOMEBREW_BREWED_CURL_PATH}" --version &>/dev/null
then
HOMEBREW_CURL="${HOMEBREW_BREWED_CURL_PATH}"
elif [[ -n "${HOMEBREW_DEVELOPER}" && -x "${HOMEBREW_CURL_PATH}" ]]
elif [[ -n "${HOMEBREW_CURL_PATH}" ]]
then
HOMEBREW_CURL="${HOMEBREW_CURL_PATH}"
else
@ -388,7 +388,7 @@ setup_git() {
"${HOMEBREW_PREFIX}/opt/git/bin/git" --version &>/dev/null
then
HOMEBREW_GIT="${HOMEBREW_PREFIX}/opt/git/bin/git"
elif [[ -n "${HOMEBREW_DEVELOPER}" && -x "${HOMEBREW_GIT_PATH}" ]]
elif [[ -n "${HOMEBREW_GIT_PATH}" ]]
then
HOMEBREW_GIT="${HOMEBREW_GIT_PATH}"
else
@ -512,12 +512,12 @@ else
# shellcheck disable=SC2248
if [[ "$(numeric "${curl_name_and_version##* }")" -lt "$(numeric "${HOMEBREW_MINIMUM_CURL_VERSION}")" ]]
then
message="Please update your system curl.
message="Please update your system curl or set HOMEBREW_CURL_PATH to a newer version.
Minimum required version: ${HOMEBREW_MINIMUM_CURL_VERSION}
Your curl version: ${curl_name_and_version##* }
Your curl executable: $(type -p ${HOMEBREW_CURL})"
if [[ -z ${HOMEBREW_CURL_PATH} || -z ${HOMEBREW_DEVELOPER} ]]
if [[ -z ${HOMEBREW_CURL_PATH} ]]
then
HOMEBREW_SYSTEM_CURL_TOO_OLD=1
HOMEBREW_FORCE_BREWED_CURL=1
@ -541,11 +541,11 @@ Your curl executable: $(type -p ${HOMEBREW_CURL})"
# shellcheck disable=SC2248
if [[ "$(numeric "${major}.${minor}.${micro}.${build}")" -lt "$(numeric "${HOMEBREW_MINIMUM_GIT_VERSION}")" ]]
then
message="Please update your system Git.
message="Please update your system Git or set HOMEBREW_GIT_PATH to a newer version.
Minimum required version: ${HOMEBREW_MINIMUM_GIT_VERSION}
Your Git version: ${major}.${minor}.${micro}.${build}
Your Git executable: $(unset git && type -p ${HOMEBREW_GIT})"
if [[ -z ${HOMEBREW_GIT_PATH} || -z ${HOMEBREW_DEVELOPER} ]]
if [[ -z ${HOMEBREW_GIT_PATH} ]]
then
HOMEBREW_FORCE_BREWED_GIT="1"
if [[ -z ${HOMEBREW_GIT_WARNING} ]]

8
Library/Homebrew/env_config.rb
View File

@ -108,6 +108,10 @@ module Homebrew
"use of `curlrc`.",
boolean: true,
},
HOMEBREW_CURL_PATH: {
description: "Linux only: Set this value to a new enough `curl` executable for Homebrew to use.",
default: "curl",
},
HOMEBREW_CURL_RETRIES: {
description: "Pass the given retry count to `--retry` when invoking `curl`(1).",
default: 3,
@ -200,6 +204,10 @@ module Homebrew
HOMEBREW_GIT_NAME: {
description: "Set the Git author and committer name to this value.",
},
HOMEBREW_GIT_PATH: {
description: "Linux only: Set this value to a new enough `git` executable for Homebrew to use.",
default: "git",
},
HOMEBREW_INSTALL_BADGE: {
description: "Print this text before the installation summary of each successful build.",
default_text: 'The "Beer Mug" emoji.',