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

Merge pull request #14422 from MikeMcQuaid/homebrew_install_from_api_improvements

Browse Source 
HOMEBREW_INSTALL_FROM_API: various improvements.
This commit is contained in:
Mike McQuaid 2023-01-25 15:11:41 +00:00 committed by GitHub
commit ee4dc3c46e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Library/Homebrew/brew.rb
View File

@ -91,8 +91,15 @@ begin
if internal_cmd || Commands.external_ruby_v2_cmd_path(cmd)
if Commands::INSTALL_FROM_API_FORBIDDEN_COMMANDS.include?(cmd) &&
!CoreTap.instance.installed? &&
Homebrew::EnvConfig.install_from_api? && !Homebrew::EnvConfig.developer?
odie "This command cannot be run while HOMEBREW_INSTALL_FROM_API is set!"
odie <<~EOS
This command cannot be run while Homebrew/homebrew-core is untapped and
HOMEBREW_NO_INSTALL_FROM_API is unset! To resolve please run:
brew tap Homebrew/core
export HOMEBREW_NO_INSTALL_FROM_API=1
and retry this command.
EOS
end
Homebrew.send Commands.method_name(cmd)

4
Library/Homebrew/cmd/install.rb
View File

@ -146,10 +146,6 @@ module Homebrew
def install
args = install_args.parse
if args.build_from_source? && Homebrew::EnvConfig.install_from_api?
raise UsageError, "--build-from-source is not supported when using HOMEBREW_INSTALL_FROM_API."
end
if args.env.present?
# Can't use `replacement: false` because `install_args` are used by
# `build.rb`. Instead, `hide_from_man_page` and don't do anything with

4
Library/Homebrew/cmd/reinstall.rb
View File

@ -94,10 +94,6 @@ module Homebrew
def reinstall
args = reinstall_args.parse
if args.build_from_source? && Homebrew::EnvConfig.install_from_api?
raise UsageError, "--build-from-source is not supported when using HOMEBREW_INSTALL_FROM_API."
end
formulae, casks = args.named.to_formulae_and_casks(method: :resolve)
.partition { |o| o.is_a?(Formula) }

5
Library/Homebrew/dev-cmd/edit.rb
View File

@ -64,7 +64,10 @@ module Homebrew
message = if Homebrew::EnvConfig.install_from_api?
<<~EOS
#{not_exist_message}
This is expected with HOMEBREW_INSTALL_FROM_API set!
This is expected with HOMEBREW_NO_INSTALL_FROM_API unset! To resolve please run:
brew tap Homebrew/core
export HOMEBREW_NO_INSTALL_FROM_API=1
and retry this command.
EOS
elsif args.cask?
<<~EOS

10
Library/Homebrew/formula_installer.rb
View File

@ -1181,8 +1181,14 @@ class FormulaInstaller
if pour_bottle?(output_warning: true)
formula.fetch_bottle_tab
elsif formula.core_formula? && Homebrew::EnvConfig.install_from_api?
odie "Unable to build #{formula.name} from source with HOMEBREW_INSTALL_FROM_API."
elsif formula.core_formula? && !formula.tap.installed? && Homebrew::EnvConfig.install_from_api?
odie <<~EOS
Unable to build #{formula.name} from source while Homebrew/homebrew-core is
untapped and HOMEBREW_NO_INSTALL_FROM_API is unset! To resolve please run:
brew tap Homebrew/core
export HOMEBREW_NO_INSTALL_FROM_API=1
and retry.
EOS
else
formula.fetch_patches
formula.resources.each(&:fetch)