Skip to content

Commit

Permalink
Fix zsh autocomplete script
Browse files Browse the repository at this point in the history
Fix completion when argument startswith `-`
Merged in upstream urfave/cli#1062

Signed-off-by: Shengjing Zhu <zhsj@debian.org>
  • Loading branch information
zhsj committed Feb 11, 2020
1 parent 4f348c5 commit 348e683
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 4 deletions.
2 changes: 1 addition & 1 deletion contrib/autocomplete/ctr 100755 → 100644
@@ -1,5 +1,5 @@
#! /bin/bash
## This file is a direct copy of https://github.com/urfave/cli/blob/a221e662f14fd7404302444a5c4293409a401210/autocomplete/bash_autocomplete
## This file is a direct copy of https://github.com/urfave/cli/blob/d04c0883fcc8860836ab30ade0fd29afa194ab23/autocomplete/bash_autocomplete

: ${PROG:=$(basename ${BASH_SOURCE})}

Expand Down
14 changes: 11 additions & 3 deletions contrib/autocomplete/zsh_autocomplete
@@ -1,13 +1,21 @@
#compdef ctr
# This file is a direct copy of https://github.com/urfave/cli/blob/a221e662f14fd7404302444a5c4293409a401210/autocomplete/zsh_autocomplete
# This file is a direct copy of https://github.com/urfave/cli/blob/d04c0883fcc8860836ab30ade0fd29afa194ab23/autocomplete/zsh_autocomplete
# With $PROG changed to ctr

_cli_zsh_autocomplete() {

local -a opts
opts=("${(@f)$(_CLI_ZSH_AUTOCOMPLETE_HACK=1 ${words[@]:0:#words[@]-1} --generate-bash-completion)}")
local cur
cur=${words[-1]}
if [[ "$cur" == "-"* ]]; then
opts=("${(@f)$(_CLI_ZSH_AUTOCOMPLETE_HACK=1 ${words[@]:0:#words[@]-1} ${cur} --generate-bash-completion)}")
else
opts=("${(@f)$(_CLI_ZSH_AUTOCOMPLETE_HACK=1 ${words[@]:0:#words[@]-1} --generate-bash-completion)}")
fi

_describe 'values' opts
if [[ "${opts[1]}" != "" ]]; then
_describe 'values' opts
fi

return
}
Expand Down

0 comments on commit 348e683

Please sign in to comment.