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

Pass args in man instead of using global args.

Browse Source
This commit is contained in:
Markus Reiter 2020-07-26 09:44:16 +02:00
parent 28b007e24b
commit e9ade913c4
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -31,12 +31,12 @@ module Homebrew
end end
def man def man
man_args.parse args = man_args.parse
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 regenerate_man_pages(args: args)
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,15 +45,15 @@ module Homebrew
end end
end end
def regenerate_man_pages def regenerate_man_pages(args:)
Homebrew.install_bundler_gems! Homebrew.install_bundler_gems!
markup = build_man_page markup = build_man_page
convert_man_page(markup, TARGET_DOC_PATH/"Manpage.md") convert_man_page(markup, TARGET_DOC_PATH/"Manpage.md", args: args)
convert_man_page(markup, TARGET_MAN_PATH/"brew.1") convert_man_page(markup, TARGET_MAN_PATH/"brew.1", args: args)
cask_markup = (SOURCE_PATH/"brew-cask.1.md").read cask_markup = (SOURCE_PATH/"brew-cask.1.md").read
convert_man_page(cask_markup, TARGET_MAN_PATH/"brew-cask.1") convert_man_page(cask_markup, TARGET_MAN_PATH/"brew-cask.1", args: args)
end end
def build_man_page def build_man_page
@ -94,7 +94,7 @@ module Homebrew
path.basename.to_s.sub(/\.(rb|sh)$/, "").sub(/^--/, "~~") path.basename.to_s.sub(/\.(rb|sh)$/, "").sub(/^--/, "~~")
end end
def convert_man_page(markup, target) def convert_man_page(markup, target, args:)
manual = target.basename(".1") manual = target.basename(".1")
organisation = "Homebrew" organisation = "Homebrew"
@ -148,7 +148,7 @@ module Homebrew
def generate_cmd_manpages(cmd_paths) def generate_cmd_manpages(cmd_paths)
man_page_lines = [] man_page_lines = []
man_args = Homebrew.args
# preserve existing manpage order # preserve existing manpage order
cmd_paths.sort_by(&method(:sort_key_for_path)) cmd_paths.sort_by(&method(:sort_key_for_path))
.each do |cmd_path| .each do |cmd_path|
@ -162,7 +162,7 @@ module Homebrew
man_page_lines << cmd_man_page_lines man_page_lines << cmd_man_page_lines
end end
Homebrew.args = man_args
man_page_lines.compact.join("\n") man_page_lines.compact.join("\n")
end end