summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2013-01-30 23:45:32 +0000
committerGerrit Code Review <review@openstack.org>2013-01-30 23:45:32 +0000
commit1e1d95d5592039fc2b342bc7918d56449adbec82 (patch)
treec481fe8777377031c40fb35b478290157c559d12 /tools
parent8d825c61c984303968d01abcf7ae60ca32da4af2 (diff)
parent364ef418b4b71336cec52869718056a1b6ce2273 (diff)
downloadpython-novaclient-1e1d95d5592039fc2b342bc7918d56449adbec82.tar.gz
Merge "Fix bash completion on osx"
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 7dee3e6d..fefa7983 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/\s-h\s/ /"`"
- _nova_opts="`echo "$nbc" | sed -e "s/--[a-z0-9_-]*//g" -e "s/\s\s*/ /g"`"
- _nova_flags="`echo " $nbc" | sed -e "s/ [^-][^-][a-z0-9_-]*//g" -e "s/\s\s*/ /g"`"
- _nova_opts_exp="`echo "$_nova_opts" | sed -e "s/\s/|/g"`"
+ 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"`"
fi
if [[ " ${COMP_WORDS[@]} " =~ " "($_nova_opts_exp)" " && "$prev" != "help" ]] ; then