From d29d58b3fb1d34d990e2cba5e3f60ab0617b4582 Mon Sep 17 00:00:00 2001
From: Martin Afanasjew <martin@afanasjew.de>
Date: Sun, 17 Apr 2016 09:36:48 +0200
Subject: [PATCH] man: put option-style commands after regular ones
---
Library/Homebrew/cmd/man.rb | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/Library/Homebrew/cmd/man.rb b/Library/Homebrew/cmd/man.rb
index eb6679743a..bc382d29f7 100644
--- a/Library/Homebrew/cmd/man.rb
+++ b/Library/Homebrew/cmd/man.rb
@@ -44,7 +44,7 @@ module Homebrew
variables = OpenStruct.new
variables[:commands] = Pathname.glob("#{HOMEBREW_LIBRARY_PATH}/cmd/*.{rb,sh}").
- sort_by { |source_file| source_file.basename.sub(/\.(rb|sh)$/, "") }.
+ sort_by { |source_file| sort_key_for_path(source_file) }.
map { |source_file|
source_file.read.lines.
grep(/^#:/).
@@ -56,6 +56,11 @@ module Homebrew
ERB.new(template, nil, ">").result(variables.instance_eval{ binding })
end
+ def sort_key_for_path(path)
+ # Options after regular commands (`~` comes after `z` in ASCII table).
+ path.basename.to_s.sub(/\.(rb|sh)$/, "").sub(/^--/, "~~")
+ end
+
def convert_man_page(markup, target)
shared_args = %W[
--pipe
--
GitLab