summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorSol Jerome <sol.jerome@gmail.com>2013-09-06 09:34:57 -0500
committerSol Jerome <sol.jerome@gmail.com>2013-09-06 09:34:57 -0500
commit965c55553037f83fc0dc0575186138bae8df1547 (patch)
treeab6b80dc5635c5e2e24529963f797bbc44930ce3 /tools
parent1f794e11c68fe1b6eb6e40fdf0aa599ba759050a (diff)
downloadbcfg2-965c55553037f83fc0dc0575186138bae8df1547.tar.gz
bcfg2-965c55553037f83fc0dc0575186138bae8df1547.tar.bz2
bcfg2-965c55553037f83fc0dc0575186138bae8df1547.zip
tools: Fix bash completion
Signed-off-by: Sol Jerome <sol.jerome@gmail.com>
Diffstat (limited to 'tools')
-rw-r--r--tools/bcfg2-completion.bash22
1 files changed, 19 insertions, 3 deletions
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