From f2621414ee5f2f601424c22f00e207903e3b6104 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sat, 4 May 2024 03:03:18 +0200 Subject: Merging upstream version 1:2.12.0. Signed-off-by: Daniel Baumann --- completions/htpasswd | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) (limited to 'completions/htpasswd') diff --git a/completions/htpasswd b/completions/htpasswd index 527684b..dafd1d9 100644 --- a/completions/htpasswd +++ b/completions/htpasswd @@ -1,9 +1,9 @@ # htpasswd(1) completion -*- shell-script -*- -_htpasswd() +_comp_cmd_htpasswd() { - local cur prev words cword - _init_completion || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return local i o=0 # $o is index of first non-option argument for ((i = 1; i <= cword; i++)); do @@ -19,18 +19,17 @@ _htpasswd() if ((o == 0 || o == cword)); then if [[ $cur == -* ]]; then - COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur")) + _comp_compgen_help return fi # Password file (first non-option argument) - _filedir + _comp_compgen_filedir elif ((o == cword - 1)); then # Username (second non-option argument) - COMPREPLY=($(compgen -W \ - '$(cut -d: -f1 "${words[o]}" 2>/dev/null)' -- "$cur")) + _comp_compgen_split -- "$(cut -d: -f1 "${words[o]}" 2>/dev/null)" fi } && - complete -F _htpasswd htpasswd + complete -F _comp_cmd_htpasswd htpasswd # ex: filetype=sh -- cgit v1.2.3