From 965c55553037f83fc0dc0575186138bae8df1547 Mon Sep 17 00:00:00 2001 From: Sol Jerome Date: Fri, 6 Sep 2013 09:34:57 -0500 Subject: tools: Fix bash completion Signed-off-by: Sol Jerome --- tools/bcfg2-completion.bash | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) (limited to 'tools') diff --git a/tools/bcfg2-completion.bash b/tools/bcfg2-completion.bash index 99cfb695b..b9e799cf8 100644 --- a/tools/bcfg2-completion.bash +++ b/tools/bcfg2-completion.bash @@ -1,14 +1,13 @@ # TODO: Add completion for each admin mode _bcfg2-admin() { - local cur prev sedcmd possibles + local cur prev possibles COMPREPLY=() cur="${COMP_WORDS[COMP_CWORD]}" prev="${COMP_WORDS[COMP_CWORD-1]}" - sedcmd='sed -n -e s/^[[:space:]][[:space:]][[:space:]]\([[:alpha:]]\+\)[[:space:]]\+.*$/\1/p' if [[ ${COMP_CWORD} -eq 1 ]] || [[ -n "${prev}" && ${prev} == -* ]] then - possibles="$(bcfg2-admin help | ${sedcmd})" + possibles="$(bcfg2-admin help | awk '{print $1}')" #elif bcfg2-admin ${prev} help &>/dev/null ; then # possibles=$(bcfg2-admin ${prev} help | ${sedcmd}) fi @@ -18,4 +17,21 @@ _bcfg2-admin() { return 0 } +_bcfg2-info() { + local cur prev possibles + COMPREPLY=() + cur="${COMP_WORDS[COMP_CWORD]}" + prev="${COMP_WORDS[COMP_CWORD-1]}" + + if [[ ${COMP_CWORD} -eq 1 ]] || [[ -n "${prev}" && ${prev} == -* ]] + then + possibles="$(bcfg2-info help | awk '{print $1}')" + fi + + [[ -n "${possibles}" ]] && \ + COMPREPLY=( $(compgen -W "${possibles}" -- ${cur}) ) + + return 0 +} complete -F _bcfg2-admin bcfg2-admin +complete -F _bcfg2-info bcfg2-info -- cgit v1.2.3-1-g7c22