summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2014-01-12 06:11:22 +0000
committerGerrit Code Review <review@openstack.org>2014-01-12 06:11:22 +0000
commit51a37b157a3f72dfa922d4a6e058a7c26c56fbff (patch)
tree8746782774406792176019c11a53f2d594366da7 /tools
parent16c5337e7937c49521f029450e24034f80b42a6a (diff)
parentf196ed01763aa9fe16d1bd724d00ca44fda01d49 (diff)
downloadpython-novaclient-51a37b157a3f72dfa922d4a6e058a7c26c56fbff.tar.gz
Merge "Fix tab-completion of --flags under OS X"
Diffstat (limited to 'tools')
-rw-r--r--tools/nova.bash_completion8
1 files changed, 4 insertions, 4 deletions
diff --git a/tools/nova.bash_completion b/tools/nova.bash_completion
index fefa7983..3c58d349 100644
--- a/tools/nova.bash_completion
+++ b/tools/nova.bash_completion
@@ -9,10 +9,10 @@ _nova()
prev="${COMP_WORDS[COMP_CWORD-1]}"
if [ "x$_nova_opts" == "x" ] ; then
- nbc="`nova bash-completion | sed -e "s/[ ]+/ /"`"
- _nova_opts="`echo "$nbc" | sed -e "s/--[a-z0-9_-]*//g" -e "s/[ ]+/ /g"`"
- _nova_flags="`echo " $nbc" | sed -e "s/ [^-][^-][a-z0-9_-]*//g" -e "s/[ ]+/ /g"`"
- _nova_opts_exp="`echo "$_nova_opts" | sed -e "s/[ ]/|/g"`"
+ nbc="`nova bash-completion | sed -e "s/ *-h */ /" -e "s/ *-i */ /"`"
+ _nova_opts="`echo "$nbc" | sed -e "s/--[a-z0-9_-]*//g" -e "s/ */ /g"`"
+ _nova_flags="`echo " $nbc" | sed -e "s/ [^-][^-][a-z0-9_-]*//g" -e "s/ */ /g"`"
+ _nova_opts_exp="`echo "$_nova_opts" | tr ' ' '|'`"
fi
if [[ " ${COMP_WORDS[@]} " =~ " "($_nova_opts_exp)" " && "$prev" != "help" ]] ; then