diff --git a/Library/Homebrew/brew.rb b/Library/Homebrew/brew.rb index 8317e2410a3f1618eded374d9f449dca3516ec1f..6caee8c39a862f0cb2d24637642a14ccc27bb0b5 100644 --- a/Library/Homebrew/brew.rb +++ b/Library/Homebrew/brew.rb @@ -139,7 +139,8 @@ begin brew_uid = HOMEBREW_BREW_FILE.stat.uid tap_commands += %W[/usr/bin/sudo -u ##{brew_uid}] if Process.uid.zero? && !brew_uid.zero? 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) end diff --git a/Library/Homebrew/commands.rb b/Library/Homebrew/commands.rb index 30098ae92bcd3ed1304f11ade453f7f3198387a0..e453a5086e23d4aa949314dae772185c7dacc22a 100644 --- a/Library/Homebrew/commands.rb +++ b/Library/Homebrew/commands.rb @@ -106,10 +106,10 @@ module Commands find_commands HOMEBREW_DEV_CMD_PATH end - def official_external_commands_paths + def official_external_commands_paths(quiet:) %w[bundle services test-bot].map do |cmd| tap = Tap.fetch("Homebrew/#{cmd}") - tap.install unless tap.installed? + tap.install(quiet: quiet) unless tap.installed? external_ruby_v2_cmd_path(cmd) end end diff --git a/Library/Homebrew/dev-cmd/man.rb b/Library/Homebrew/dev-cmd/man.rb index 7e1f3ca0d9967a42f04f5ff2a10b0b5e5cce2950..4d7f961f92e8ef03b68d09c565030133aeb8b259 100644 --- a/Library/Homebrew/dev-cmd/man.rb +++ b/Library/Homebrew/dev-cmd/man.rb @@ -36,7 +36,7 @@ module Homebrew odie "`brew man --link` is now done automatically by `brew update`." if args.link? 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" puts "No changes to manpage or completions output detected." @@ -45,21 +45,22 @@ module Homebrew end end - def regenerate_man_pages(preserve_date:) + def regenerate_man_pages(preserve_date:, quiet:) 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_MAN_PATH/"brew.1", preserve_date: preserve_date) end - def build_man_page + def build_man_page(quiet:) template = (SOURCE_PATH/"brew.1.md.erb").read variables = OpenStruct.new variables[:commands] = generate_cmd_manpages(Commands.internal_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[:environment_variables] = env_vars_manpage