Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

brew.sh: don't set HOMEBREW_NO_INSTALL_FROM_API automatically. #15868

Merged
merged 1 commit into from
Aug 15, 2023
Merged

brew.sh: don't set HOMEBREW_NO_INSTALL_FROM_API automatically. #15868

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
16 changes: 0 additions & 16 deletions Library/Homebrew/brew.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -533,8 +533,6 @@ then
# shellcheck disable=SC2086,SC2183
printf -v HOMEBREW_MACOS_VERSION_NUMERIC "%02d%02d%02d" ${HOMEBREW_MACOS_VERSION//./ }
# shellcheck disable=SC2248
printf -v HOMEBREW_MACOS_OLDEST_SUPPORTED_NUMERIC "%02d%02d%02d" ${HOMEBREW_MACOS_OLDEST_SUPPORTED//./ }
# shellcheck disable=SC2248
printf -v HOMEBREW_MACOS_OLDEST_ALLOWED_NUMERIC "%02d%02d%02d" ${HOMEBREW_MACOS_OLDEST_ALLOWED//./ }

# Don't include minor versions for Big Sur and later.
Expand Down Expand Up @@ -593,13 +591,6 @@ then
# shellcheck disable=SC2034
HOMEBREW_MACOS_SYSTEM_RUBY_NEW_ENOUGH="1"
fi

# Don't support API at this time for older macOS versions.
if [[ "${HOMEBREW_MACOS_VERSION_NUMERIC}" -lt "${HOMEBREW_MACOS_OLDEST_SUPPORTED_NUMERIC}" ]]
then
export HOMEBREW_INSTALL_FROM_API_UNSUPPORTED=1
export HOMEBREW_NO_INSTALL_FROM_API=1
fi
else
HOMEBREW_PRODUCT="${HOMEBREW_SYSTEM}brew"
[[ -n "${HOMEBREW_LINUX}" ]] && HOMEBREW_OS_VERSION="$(source /etc/os-release && echo "${PRETTY_NAME}")"
Expand Down Expand Up @@ -672,13 +663,6 @@ Your Git executable: $(unset git && type -p "${HOMEBREW_GIT}")"
fi
fi

# Generic OS or non-default prefix: API not supported.
if [[ (-z "${HOMEBREW_MACOS}" && -z "${HOMEBREW_LINUX}") || "${HOMEBREW_PREFIX}" != "${HOMEBREW_DEFAULT_PREFIX}" ]]
then
export HOMEBREW_INSTALL_FROM_API_UNSUPPORTED=1
export HOMEBREW_NO_INSTALL_FROM_API=1
fi

setup_ca_certificates() {
if [[ -n "${HOMEBREW_FORCE_BREWED_CA_CERTIFICATES}" && -f "${HOMEBREW_PREFIX}/etc/ca-certificates/cert.pem" ]]
then
Expand Down
3 changes: 1 addition & 2 deletions Library/Homebrew/cmd/update-report.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -377,8 +377,7 @@ def install_from_api_message
!ENV["HOMEBREW_GITHUB_HOSTED_RUNNER"] &&
!ENV["GITHUB_ACTIONS_HOMEBREW_SELF_HOSTED"]
no_install_from_api_set = Homebrew::EnvConfig.no_install_from_api? &&
!Homebrew::EnvConfig.automatically_set_no_install_from_api? &&
!Homebrew::EnvConfig.install_from_api_unsupported?
!Homebrew::EnvConfig.automatically_set_no_install_from_api?
return if !no_auto_update_set && !no_install_from_api_set && !auto_update_secs_set

ohai "You have set:"
Expand Down
5 changes: 0 additions & 5 deletions Library/Homebrew/env_config.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -498,10 +498,5 @@ def cask_opts_require_sha?
def automatically_set_no_install_from_api?
ENV["HOMEBREW_AUTOMATICALLY_SET_NO_INSTALL_FROM_API"].present?
end

sig { returns(T::Boolean) }
def install_from_api_unsupported?
ENV["HOMEBREW_INSTALL_FROM_API_UNSUPPORTED"].present?
end
end
end
2 changes: 0 additions & 2 deletions docs/Installation.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,6 @@ export HOMEBREW_NO_INSTALL_FROM_API=1

This will make Homebrew install formulae and casks from the `homebrew/core` and `homebrew/cask` taps using local checkouts of these repositories instead of Homebrew’s API.

Note that this will automatically be set on unsupported configurations (i.e. not using the default Homebrew prefix or, if on macOS, on an unsupported version).

## Unattended installation

If you want a non-interactive run of the Homebrew installer that doesn't prompt for passwords (e.g. in automation scripts), prepend [`NONINTERACTIVE=1`](https://github.com/Homebrew/install/#install-homebrew-on-macos-or-linux) to the installation command.
Expand Down