generate-cmdlist.sh: don't call get_categories() from category_list()

This isn't for optimization as the get_categories() is a purely shell
function, but rather for ease of readability, let's just inline these
two lines. We'll be changing this code some more in subsequent commits
to make this worth it.

Rename the get_categories() function to get_category_line(), since
that's what it's doing now.

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/generate-cmdlist.sh b/generate-cmdlist.sh
index 27367915611a08718c00b4fb9f46784a24c37127..16043e38476657d3eafc42c0af996dd2cf47f5d4 100755 (executable)
--- a/generate-cmdlist.sh
+++ b/generate-cmdlist.sh
@@ -9,7 +9,7 @@ command_list () {
        eval "grep -ve '^#' $exclude_programs" <"$1"
 }
 
-get_categories () {
+get_category_line () {
        tr ' ' '\012' |
        LC_ALL=C sort -u
 }
@@ -17,7 +17,8 @@ get_categories () {
 category_list () {
        command_list "$1" |
        cut -c 40- |
-       get_categories |
+       tr ' ' '\012' |
+       LC_ALL=C sort -u |
        grep -v '^$'
 }
 
@@ -66,7 +67,7 @@ print_command_list () {
        while read cmd rest
        do
                printf "        { \"$cmd\", $(get_synopsis $cmd), 0"
-               for cat in $(echo "$rest" | get_categories)
+               for cat in $(echo "$rest" | get_category_line)
                do
                        printf " | CAT_$cat"
                done