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

Merge pull request #8673 from reitermarkus/tap-pass-quiet

Browse Source 
Pass `quiet` when tapping external commands.
This commit is contained in:
Markus Reiter 2020-09-10 02:00:26 +02:00 committed by GitHub
commit 2cead8e6dc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Library/Homebrew/brew.rb
View File

@ -139,7 +139,8 @@ begin
brew_uid = HOMEBREW_BREW_FILE.stat.uid brew_uid = HOMEBREW_BREW_FILE.stat.uid
tap_commands += %W[/usr/bin/sudo -u ##{brew_uid}] if Process.uid.zero? && !brew_uid.zero? tap_commands += %W[/usr/bin/sudo -u ##{brew_uid}] if Process.uid.zero? && !brew_uid.zero?
end end
tap_commands += %W[#{HOMEBREW_BREW_FILE} tap #{possible_tap.name}] quiet_arg = args.quiet? ? "--quiet" : nil
tap_commands += [HOMEBREW_BREW_FILE, "tap", *quiet_arg, possible_tap.name]
safe_system(*tap_commands) safe_system(*tap_commands)
end end

4
Library/Homebrew/commands.rb
View File

@ -106,10 +106,10 @@ module Commands
find_commands HOMEBREW_DEV_CMD_PATH find_commands HOMEBREW_DEV_CMD_PATH
end end
def official_external_commands_paths def official_external_commands_paths(quiet:)
%w[bundle services test-bot].map do |cmd| %w[bundle services test-bot].map do |cmd|
tap = Tap.fetch("Homebrew/#{cmd}") tap = Tap.fetch("Homebrew/#{cmd}")
tap.install unless tap.installed? tap.install(quiet: quiet) unless tap.installed?
external_ruby_v2_cmd_path(cmd) external_ruby_v2_cmd_path(cmd)
end end
end end

11
Library/Homebrew/dev-cmd/man.rb
View File

@ -36,7 +36,7 @@ module Homebrew
odie "`brew man --link` is now done automatically by `brew update`." if args.link? odie "`brew man --link` is now done automatically by `brew update`." if args.link?
Commands.rebuild_internal_commands_completion_list Commands.rebuild_internal_commands_completion_list
regenerate_man_pages(preserve_date: args.fail_if_changed?) regenerate_man_pages(preserve_date: args.fail_if_changed?, quiet: args.quiet?)
if system "git", "-C", HOMEBREW_REPOSITORY, "diff", "--quiet", "docs/Manpage.md", "manpages", "completions" if system "git", "-C", HOMEBREW_REPOSITORY, "diff", "--quiet", "docs/Manpage.md", "manpages", "completions"
puts "No changes to manpage or completions output detected." puts "No changes to manpage or completions output detected."
@ -45,21 +45,22 @@ module Homebrew
end end
end end
def regenerate_man_pages(preserve_date:) def regenerate_man_pages(preserve_date:, quiet:)
Homebrew.install_bundler_gems! Homebrew.install_bundler_gems!
markup = build_man_page markup = build_man_page(quiet: quiet)
convert_man_page(markup, TARGET_DOC_PATH/"Manpage.md", preserve_date: preserve_date) convert_man_page(markup, TARGET_DOC_PATH/"Manpage.md", preserve_date: preserve_date)
convert_man_page(markup, TARGET_MAN_PATH/"brew.1", preserve_date: preserve_date) convert_man_page(markup, TARGET_MAN_PATH/"brew.1", preserve_date: preserve_date)
end end
def build_man_page def build_man_page(quiet:)
template = (SOURCE_PATH/"brew.1.md.erb").read template = (SOURCE_PATH/"brew.1.md.erb").read
variables = OpenStruct.new variables = OpenStruct.new
variables[:commands] = generate_cmd_manpages(Commands.internal_commands_paths) variables[:commands] = generate_cmd_manpages(Commands.internal_commands_paths)
variables[:developer_commands] = generate_cmd_manpages(Commands.internal_developer_commands_paths) variables[:developer_commands] = generate_cmd_manpages(Commands.internal_developer_commands_paths)
variables[:official_external_commands] = generate_cmd_manpages(Commands.official_external_commands_paths) variables[:official_external_commands] =
generate_cmd_manpages(Commands.official_external_commands_paths(quiet: quiet))
variables[:global_options] = global_options_manpage variables[:global_options] = global_options_manpage
variables[:environment_variables] = env_vars_manpage variables[:environment_variables] = env_vars_manpage