diff options
| author | Mike McQuaid | 2016-08-20 16:57:03 +0100 |
|---|---|---|
| committer | GitHub | 2016-08-20 16:57:03 +0100 |
| commit | 7c7e2d00af9d8a05f4736c368804713fba61a422 (patch) | |
| tree | c8eb7210ca5837a7063ca6919b349ee17f5f5032 | |
| parent | bb4d168c4869a6b545250105a6bee43b800018ad (diff) | |
| parent | 665783cba487a9e9bc772176ebb62761671f7095 (diff) | |
| download | brew-7c7e2d00af9d8a05f4736c368804713fba61a422.tar.bz2 | |
Merge pull request #768 from MikeMcQuaid/cask-man
Make "brew man" also generate Cask's manpage.
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | Library/Homebrew/cask/Rakefile | 3 | ||||
| -rw-r--r-- | Library/Homebrew/cmd/man.rb | 5 | ||||
| -rw-r--r-- | share/man/man1/brew-cask.1 (renamed from Library/Homebrew/cask/man/man1/brew-cask.1) | 2 |
4 files changed, 7 insertions, 4 deletions
diff --git a/.gitignore b/.gitignore index efbe23cfe..39dd7a483 100644 --- a/.gitignore +++ b/.gitignore @@ -39,6 +39,7 @@ !/.github !/share/doc/homebrew !/share/man/man1/brew.1 +!/share/man/man1/brew-cask.1 # Ignore `etc` contents (again) /etc diff --git a/Library/Homebrew/cask/Rakefile b/Library/Homebrew/cask/Rakefile index a8373fa96..6c638ff49 100644 --- a/Library/Homebrew/cask/Rakefile +++ b/Library/Homebrew/cask/Rakefile @@ -47,6 +47,5 @@ end desc "Generate man page from Markdown source" task :man do - sh "ronn --roff --pipe --organization=Homebrew-Cask --manual=brew-cask " \ - "doc/man_page/brew-cask.1.md > man/man1/brew-cask.1" + sh "brew man" end diff --git a/Library/Homebrew/cmd/man.rb b/Library/Homebrew/cmd/man.rb index d704d46a1..536b27984 100644 --- a/Library/Homebrew/cmd/man.rb +++ b/Library/Homebrew/cmd/man.rb @@ -37,6 +37,9 @@ module Homebrew markup = build_man_page convert_man_page(markup, TARGET_DOC_PATH/"brew.1.html") convert_man_page(markup, TARGET_MAN_PATH/"brew.1") + + cask_markup = (HOMEBREW_LIBRARY/"Homebrew/cask/doc/man_page/brew-cask.1.md").read + convert_man_page(cask_markup, TARGET_MAN_PATH/"brew-cask.1") end def build_man_page @@ -69,7 +72,7 @@ module Homebrew shared_args = %W[ --pipe --organization=Homebrew - --manual=brew + --manual=#{target.basename(".1")} ] format_flag, format_desc = target_path_to_format(target) diff --git a/Library/Homebrew/cask/man/man1/brew-cask.1 b/share/man/man1/brew-cask.1 index 348a34b41..483feec5e 100644 --- a/Library/Homebrew/cask/man/man1/brew-cask.1 +++ b/share/man/man1/brew-cask.1 @@ -1,7 +1,7 @@ .\" generated with Ronn/v0.7.3 .\" http://github.com/rtomayko/ronn/tree/0.7.3 . -.TH "BREW\-CASK" "1" "August 2016" "Homebrew-Cask" "brew-cask" +.TH "BREW\-CASK" "1" "August 2016" "Homebrew" "brew-cask" . .SH "NAME" \fBbrew\-cask\fR \- a friendly binary installer for macOS |