glenux-archive/spf13--cobra
1
0
Fork 0
mirror of https://github.com/spf13/cobra synced 2025-05-06 13:27:26 +00:00
Code Issues Projects Releases Packages Wiki Activity

Quote bash variables in bash_completion.go, fixes #766

Browse source
This commit is contained in:
Brian Williams 2018-10-20 19:03:44 -05:00
parent 40172f1635
commit 4dbaa47f9c
1 changed files with 44 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

88
bash_completions.go
View file

@ -24,7 +24,7 @@ func writePreamble(buf *bytes.Buffer, name string) {
buf.WriteString(fmt.Sprintf(` buf.WriteString(fmt.Sprintf(`
__%[1]s_debug() __%[1]s_debug()
{ {
if [[ -n ${BASH_COMP_DEBUG_FILE} ]]; then if [[ -n "${BASH_COMP_DEBUG_FILE}" ]]; then
echo "$*" >> "${BASH_COMP_DEBUG_FILE}" echo "$*" >> "${BASH_COMP_DEBUG_FILE}"
fi fi
} }
@ -39,21 +39,21 @@ __%[1]s_init_completion()
__%[1]s_index_of_word() __%[1]s_index_of_word()
{ {
local w word=$1 local w word="$1"
shift shift
index=0 index=0
for w in "$@"; do for w in "$@"; do
[[ $w = "$word" ]] && return [[ "$w" = "$word" ]] && return
index=$((index+1)) index="$((index+1))"
done done
index=-1 index=-1
} }
__%[1]s_contains_word() __%[1]s_contains_word()
{ {
local w word=$1; shift local w word="$1"; shift
for w in "$@"; do for w in "$@"; do
[[ $w = "$word" ]] && return [[ "$w" = "$word" ]] && return
done done
return 1 return 1
} }
@ -61,25 +61,25 @@ __%[1]s_contains_word()
__%[1]s_handle_reply() __%[1]s_handle_reply()
{ {
__%[1]s_debug "${FUNCNAME[0]}" __%[1]s_debug "${FUNCNAME[0]}"
case $cur in case "$cur" in
-*) -*)
if [[ $(type -t compopt) = "builtin" ]]; then if [[ "$(type -t compopt)" = "builtin" ]]; then
compopt -o nospace compopt -o nospace
fi fi
local allflags local allflags
if [ ${#must_have_one_flag[@]} -ne 0 ]; then if [ "${#must_have_one_flag[@]}" -ne 0 ]; then
allflags=("${must_have_one_flag[@]}") allflags=("${must_have_one_flag[@]}")
else else
allflags=("${flags[*]} ${two_word_flags[*]}") allflags=("${flags[*]} ${two_word_flags[*]}")
fi fi
COMPREPLY=( $(compgen -W "${allflags[*]}" -- "$cur") ) COMPREPLY=( "$(compgen -W "${allflags[*]}" -- "$cur")" )
if [[ $(type -t compopt) = "builtin" ]]; then if [[ "$(type -t compopt)" = "builtin" ]]; then
[[ "${COMPREPLY[0]}" == *= ]] || compopt +o nospace [[ "${COMPREPLY[0]}" == *= ]] || compopt +o nospace
fi fi
# complete after --flag=abc # complete after --flag=abc
if [[ $cur == *=* ]]; then if [[ "$cur" == *=* ]]; then
if [[ $(type -t compopt) = "builtin" ]]; then if [[ "$(type -t compopt)" = "builtin" ]]; then
compopt +o nospace compopt +o nospace
fi fi
@ -87,10 +87,10 @@ __%[1]s_handle_reply()
flag="${cur%%=*}" flag="${cur%%=*}"
__%[1]s_index_of_word "${flag}" "${flags_with_completion[@]}" __%[1]s_index_of_word "${flag}" "${flags_with_completion[@]}"
COMPREPLY=() COMPREPLY=()
if [[ ${index} -ge 0 ]]; then if [[ "${index}" -ge 0 ]]; then
PREFIX="" PREFIX=""
cur="${cur#*=}" cur="${cur#*=}"
${flags_completion[${index}]} "${flags_completion["${index}"]}"
if [ -n "${ZSH_VERSION}" ]; then if [ -n "${ZSH_VERSION}" ]; then
# zsh completion needs --flag= prefix # zsh completion needs --flag= prefix
eval "COMPREPLY=( \"\${COMPREPLY[@]/#/${flag}=}\" )" eval "COMPREPLY=( \"\${COMPREPLY[@]/#/${flag}=}\" )"
@ -104,31 +104,31 @@ __%[1]s_handle_reply()
# check if we are handling a flag with special work handling # check if we are handling a flag with special work handling
local index local index
__%[1]s_index_of_word "${prev}" "${flags_with_completion[@]}" __%[1]s_index_of_word "${prev}" "${flags_with_completion[@]}"
if [[ ${index} -ge 0 ]]; then if [[ "${index}" -ge 0 ]]; then
${flags_completion[${index}]} "${flags_completion["${index}"]}"
return return
fi fi
# we are parsing a flag and don't have a special handler, no completion # we are parsing a flag and don't have a special handler, no completion
if [[ ${cur} != "${words[cword]}" ]]; then if [[ "${cur}" != "${words[cword]}" ]]; then
return return
fi fi
local completions local completions
completions=("${commands[@]}") completions=("${commands[@]}")
if [[ ${#must_have_one_noun[@]} -ne 0 ]]; then if [[ "${#must_have_one_noun[@]}" -ne 0 ]]; then
completions=("${must_have_one_noun[@]}") completions=("${must_have_one_noun[@]}")
fi fi
if [[ ${#must_have_one_flag[@]} -ne 0 ]]; then if [[ "${#must_have_one_flag[@]}" -ne 0 ]]; then
completions+=("${must_have_one_flag[@]}") completions+=("${must_have_one_flag[@]}")
fi fi
COMPREPLY=( $(compgen -W "${completions[*]}" -- "$cur") ) COMPREPLY=( "$(compgen -W "${completions[*]}" -- "$cur")" )
if [[ ${#COMPREPLY[@]} -eq 0 && ${#noun_aliases[@]} -gt 0 && ${#must_have_one_noun[@]} -ne 0 ]]; then if [[ "${#COMPREPLY[@]}" -eq 0 && "${#noun_aliases[@]}" -gt 0 && "${#must_have_one_noun[@]}" -ne 0 ]]; then
COMPREPLY=( $(compgen -W "${noun_aliases[*]}" -- "$cur") ) COMPREPLY=( "$(compgen -W "${noun_aliases[*]}" -- "$cur")" )
fi fi
if [[ ${#COMPREPLY[@]} -eq 0 ]]; then if [[ "${#COMPREPLY[@]}" -eq 0 ]]; then
if declare -F __%[1]s_custom_func >/dev/null; then if declare -F __%[1]s_custom_func >/dev/null; then
# try command name qualified custom func # try command name qualified custom func
__%[1]s_custom_func __%[1]s_custom_func
@ -145,7 +145,7 @@ __%[1]s_handle_reply()
# If there is only 1 completion and it is a flag with an = it will be completed # If there is only 1 completion and it is a flag with an = it will be completed
# but we don't want a space after the = # but we don't want a space after the =
if [[ "${#COMPREPLY[@]}" -eq "1" ]] && [[ $(type -t compopt) = "builtin" ]] && [[ "${COMPREPLY[0]}" == --*= ]]; then if [[ "${#COMPREPLY[@]}" -eq "1" ]] && [[ "$(type -t compopt)" = "builtin" ]] && [[ "${COMPREPLY[0]}" == --*= ]]; then
compopt -o nospace compopt -o nospace
fi fi
} }
@ -168,12 +168,12 @@ __%[1]s_handle_flag()
__%[1]s_debug "${FUNCNAME[0]}: c is $c words[c] is ${words[c]}" __%[1]s_debug "${FUNCNAME[0]}: c is $c words[c] is ${words[c]}"
# if a command required a flag, and we found it, unset must_have_one_flag() # if a command required a flag, and we found it, unset must_have_one_flag()
local flagname=${words[c]} local flagname="${words[c]}"
local flagvalue local flagvalue
# if the word contained an = # if the word contained an =
if [[ ${words[c]} == *"="* ]]; then if [[ "${words[c]}" == *"="* ]]; then
flagvalue=${flagname#*=} # take in as flagvalue after the = flagvalue="${flagname#*=}" # take in as flagvalue after the =
flagname=${flagname%%=*} # strip everything after the = flagname="${flagname%%=*}" # strip everything after the =
flagname="${flagname}=" # but put the = back flagname="${flagname}=" # but put the = back
fi fi
__%[1]s_debug "${FUNCNAME[0]}: looking for ${flagname}" __%[1]s_debug "${FUNCNAME[0]}: looking for ${flagname}"
@ -190,24 +190,24 @@ __%[1]s_handle_flag()
# flaghash variable is an associative array which is only supported in bash > 3. # flaghash variable is an associative array which is only supported in bash > 3.
if [[ -z "${BASH_VERSION}" || "${BASH_VERSINFO[0]}" -gt 3 ]]; then if [[ -z "${BASH_VERSION}" || "${BASH_VERSINFO[0]}" -gt 3 ]]; then
if [ -n "${flagvalue}" ] ; then if [ -n "${flagvalue}" ] ; then
flaghash[${flagname}]=${flagvalue} flaghash["${flagname}"]="${flagvalue}"
elif [ -n "${words[ $((c+1)) ]}" ] ; then elif [ -n "${words[ "$((c+1))" ]}" ] ; then
flaghash[${flagname}]=${words[ $((c+1)) ]} flaghash["${flagname}"]="${words[ "$((c+1))" ]}"
else else
flaghash[${flagname}]="true" # pad "true" for bool flag flaghash["${flagname}"]="true" # pad "true" for bool flag
fi fi
fi fi
# skip the argument to a two word flag # skip the argument to a two word flag
if __%[1]s_contains_word "${words[c]}" "${two_word_flags[@]}"; then if __%[1]s_contains_word "${words[c]}" "${two_word_flags[@]}"; then
c=$((c+1)) c="$((c+1))"
# if we are looking for a flags value, don't show commands # if we are looking for a flags value, don't show commands
if [[ $c -eq $cword ]]; then if [[ "$c" -eq "$cword" ]]; then
commands=() commands=()
fi fi
fi fi
c=$((c+1)) c="$((c+1))"
} }
@ -222,7 +222,7 @@ __%[1]s_handle_noun()
fi fi
nouns+=("${words[c]}") nouns+=("${words[c]}")
c=$((c+1)) c="$((c+1))"
} }
__%[1]s_handle_command() __%[1]s_handle_command()
@ -230,23 +230,23 @@ __%[1]s_handle_command()
__%[1]s_debug "${FUNCNAME[0]}: c is $c words[c] is ${words[c]}" __%[1]s_debug "${FUNCNAME[0]}: c is $c words[c] is ${words[c]}"
local next_command local next_command
if [[ -n ${last_command} ]]; then if [[ -n "${last_command}" ]]; then
next_command="_${last_command}_${words[c]//:/__}" next_command="_${last_command}_${words[c]//:/__}"
else else
if [[ $c -eq 0 ]]; then if [[ "$c" -eq 0 ]]; then
next_command="_%[1]s_root_command" next_command="_%[1]s_root_command"
else else
next_command="_${words[c]//:/__}" next_command="_${words[c]//:/__}"
fi fi
fi fi
c=$((c+1)) c="$((c+1))"
__%[1]s_debug "${FUNCNAME[0]}: looking for ${next_command}" __%[1]s_debug "${FUNCNAME[0]}: looking for ${next_command}"
declare -F "$next_command" >/dev/null && $next_command declare -F "$next_command" >/dev/null && $next_command
} }
__%[1]s_handle_word() __%[1]s_handle_word()
{ {
if [[ $c -ge $cword ]]; then if [[ "$c" -ge "$cword" ]]; then
__%[1]s_handle_reply __%[1]s_handle_reply
return return
fi fi
@ -255,12 +255,12 @@ __%[1]s_handle_word()
__%[1]s_handle_flag __%[1]s_handle_flag
elif __%[1]s_contains_word "${words[c]}" "${commands[@]}"; then elif __%[1]s_contains_word "${words[c]}" "${commands[@]}"; then
__%[1]s_handle_command __%[1]s_handle_command
elif [[ $c -eq 0 ]]; then elif [[ "$c" -eq 0 ]]; then
__%[1]s_handle_command __%[1]s_handle_command
elif __%[1]s_contains_word "${words[c]}" "${command_aliases[@]}"; then elif __%[1]s_contains_word "${words[c]}" "${command_aliases[@]}"; then
# aliashash variable is an associative array which is only supported in bash > 3. # aliashash variable is an associative array which is only supported in bash > 3.
if [[ -z "${BASH_VERSION}" || "${BASH_VERSINFO[0]}" -gt 3 ]]; then if [[ -z "${BASH_VERSION}" || "${BASH_VERSINFO[0]}" -gt 3 ]]; then
words[c]=${aliashash[${words[c]}]} words[c]="${aliashash["${words[c]}"]}"
__%[1]s_handle_command __%[1]s_handle_command
else else
__%[1]s_handle_noun __%[1]s_handle_noun
@ -303,7 +303,7 @@ func writePostscript(buf *bytes.Buffer, name string) {
} }
`, name)) `, name))
buf.WriteString(fmt.Sprintf(`if [[ $(type -t compopt) = "builtin" ]]; then buf.WriteString(fmt.Sprintf(`if [[ "$(type -t compopt)" = "builtin" ]]; then
complete -o default -F __start_%s %s complete -o default -F __start_%s %s
else else
complete -o default -o nospace -F __start_%s %s complete -o default -o nospace -F __start_%s %s