From 79323d6d41c91860cd05800a06cf8076df5051bd Mon Sep 17 00:00:00 2001 From: Oliver Kiddle Date: Fri, 15 Mar 2002 16:26:08 +0000 Subject: 16842: resolve name clash for nc between netcat and the nedit client for completion and add _pick_variant to resolve program variants in general --- Completion/Base/Utility/.distfiles | 2 +- Completion/Base/Utility/_pick_variant | 35 +++++++++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+), 1 deletion(-) create mode 100644 Completion/Base/Utility/_pick_variant (limited to 'Completion/Base') diff --git a/Completion/Base/Utility/.distfiles b/Completion/Base/Utility/.distfiles index 30ddbac5e..de4c5ef20 100644 --- a/Completion/Base/Utility/.distfiles +++ b/Completion/Base/Utility/.distfiles @@ -3,6 +3,6 @@ DISTFILES_SRC=' _alternative _call_program _nothing _sub_commands _arg_compile _combination _regex_arguments _values _arguments _set_command _retrieve_cache _guard -_cache_invalid _describe _sep_parts +_cache_invalid _describe _sep_parts _pick_variant _call_function _multi_parts _store_cache ' diff --git a/Completion/Base/Utility/_pick_variant b/Completion/Base/Utility/_pick_variant new file mode 100644 index 000000000..a80cddb26 --- /dev/null +++ b/Completion/Base/Utility/_pick_variant @@ -0,0 +1,35 @@ +#autoload + +local output cmd pat +local -a var +local -A opts + +(( $+_cmd_variant )) || typeset -gA _cmd_variant + +zparseopts -D -A opts c: r: +: ${opts[-c]:=$words[1]} + +while [[ $1 = *=* ]]; do + var+=( "${1%%\=*}" "${1#*=}" ) + shift +done +if (( $+_cmd_variant[$opts[-c]] )); then + (( $+opts[-r] )) && eval "${opts[-r]}=${_cmd_variant[$opts[-c]]}" + [[ $_cmd_variant[$opts[-c]] = "$1" ]] && return 1 + return 0 +fi + +output="$(_call_program variant $opts[-c] "${@[2,-1]}" &1)" + +for cmd pat in "$var[@]"; do + if [[ $output = *$~pat* ]]; then + (( $+opts[-r] )) && eval "${opts[-r]}=$cmd" + _cmd_variant[$opts[-c]]="$cmd" + return + fi +done + +(( $+opts[-r] )) && eval "${opts[-r]}=$1" +_cmd_variant[$opts[-c]]="$1" + +return 1 -- cgit 1.4.1