From 54614a941b4e0048c6ef9f5f12f9ec581920a856 Mon Sep 17 00:00:00 2001 From: Clint Adams Date: Sun, 17 Apr 2005 13:40:23 +0000 Subject: * 21150: Completion/Unix/Command/_baz, Completion/Unix/Command/_tla: handle parsing of subcommand help output a bit more sanely. --- ChangeLog | 6 ++++++ Completion/Unix/Command/_baz | 4 ++-- Completion/Unix/Command/_tla | 4 ++-- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5edc0fd30..2d49c5971 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2005-04-17 Clint Adams + + * 21150: Completion/Unix/Command/_baz, + Completion/Unix/Command/_tla: handle parsing of subcommand help + output a bit more sanely. + 2005-04-16 Bart Schaefer * unposted (see 21148): Test/A04redirect.ztst: update test for diff --git a/Completion/Unix/Command/_baz b/Completion/Unix/Command/_baz index c5a65437a..a15596488 100644 --- a/Completion/Unix/Command/_baz +++ b/Completion/Unix/Command/_baz @@ -490,8 +490,7 @@ _baz_main () { arguments=() local input - input=(${${(f)"$($BAZ $cmd -h)"}# }) - shift 6 input + input=(${${(M)${(f)"$($BAZ $cmd -h)"}:# *}# }) local i j=1 local short long arg desc action @@ -513,6 +512,7 @@ _baz_main () { (( i++ )) desc[j]="$desc[j] ${input[i]##* }" fi + [[ "$short[j]" == -[hHV] ]] && continue desc[j]="${${desc[j]//\[/\\[}//\]/\\]}" # escape brackets case $arg[j] in diff --git a/Completion/Unix/Command/_tla b/Completion/Unix/Command/_tla index 876f9dcf3..a047d1dd1 100644 --- a/Completion/Unix/Command/_tla +++ b/Completion/Unix/Command/_tla @@ -527,8 +527,7 @@ _tla_main () { arguments=() local input - input=(${${(f)"$($TLA $cmd -h)"}# }) - shift 6 input + input=(${${(M)${(f)"$($TLA $cmd -h)"}:# *}# }) local i j=1 local short long arg desc action @@ -550,6 +549,7 @@ _tla_main () { (( i++ )) desc[j]="$desc[j] ${input[i]##* }" fi + [[ "$short[j]" == -[hHV] ]] && continue desc[j]="${${desc[j]//\[/\\[}//\]/\\]}" # escape brackets case $arg[j] in -- cgit 1.4.1