From 4a9ee8154a13a0bc7b9fa3aea47108b12072ab07 Mon Sep 17 00:00:00 2001
From: Markus Reiter
Date: Tue, 20 Sep 2016 11:50:02 +0200
Subject: Simplify `brew man` authors.

---
 Library/Homebrew/dev-cmd/man.rb         | 17 ++++++-----------
 Library/Homebrew/manpages/brew.1.md.erb |  6 +++---
 2 files changed, 9 insertions(+), 14 deletions(-)

(limited to 'Library')

diff --git a/Library/Homebrew/dev-cmd/man.rb b/Library/Homebrew/dev-cmd/man.rb
index 0627241a3..871fbf46c 100644
--- a/Library/Homebrew/dev-cmd/man.rb
+++ b/Library/Homebrew/dev-cmd/man.rb
@@ -52,17 +52,12 @@ module Homebrew
     variables[:commands] = path_glob_commands("#{HOMEBREW_LIBRARY_PATH}/cmd/*.{rb,sh}")
     variables[:developer_commands] = path_glob_commands("#{HOMEBREW_LIBRARY_PATH}/dev-cmd/*.{rb,sh}")
     readme = HOMEBREW_REPOSITORY/"README.md"
-    variables[:lead_maintainer] = readme
-                                  .read[/Homebrew's lead maintainer is (.*)\./, 1]
-                                  .scan(/\[([^\]]*)\]/).flatten.first
-    variables[:maintainers] = readme
-                              .read[/Homebrew's current maintainers are (.*)\./, 1]
-                              .scan(/\[([^\]]*)\]/).flatten
-    former_maintainers = readme
-                         .read[/Former maintainers with significant contributions include (.*)\./, 1]
-                         .scan(/\[([^\]]*)\]/).flatten
-    variables[:former_maintainers] = former_maintainers[0...-1]
-    variables[:creator] = former_maintainers.last
+    variables[:lead_maintainer] = readme.read[/(Homebrew's lead maintainer .*\.)/, 1]
+                                        .gsub(/\[([^\]]+)\]\([^)]+\)/, '\1')
+    variables[:maintainers] = readme.read[/(Homebrew's current maintainers .*\.)/, 1]
+                                    .gsub(/\[([^\]]+)\]\([^)]+\)/, '\1')
+    variables[:former_maintainers] = readme.read[/(Former maintainers .*\.)/, 1]
+                                           .gsub(/\[([^\]]+)\]\([^)]+\)/, '\1')
 
     ERB.new(template, nil, ">").result(variables.instance_eval { binding })
   end
diff --git a/Library/Homebrew/manpages/brew.1.md.erb b/Library/Homebrew/manpages/brew.1.md.erb
index e44dc2658..bc2140b40 100644
--- a/Library/Homebrew/manpages/brew.1.md.erb
+++ b/Library/Homebrew/manpages/brew.1.md.erb
@@ -255,11 +255,11 @@ Homebrew Documentation: <https://github.com/Homebrew/brew/blob/master/docs/>
 
 ## AUTHORS
 
-Homebrew's lead maintainer is <%= lead_maintainer %>.
+<%= lead_maintainer.concat("\n") %>
 
-Homebrew's current maintainers are <%= maintainers[0...-1].join(", ") %> and <%= maintainers[-1] %>.
+<%= maintainers.concat("\n") %>
 
-Former maintainers with significant contributions include <%= former_maintainers.join(", ") %> and Homebrew's creator: <%= creator %>.
+<%= former_maintainers.concat("\n") %>
 
 ## BUGS
 
-- 
cgit v1.2.3