summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDominique Martinet <asmadeus@codewreck.org>2016-01-27 18:40:00 +0100
committerDominique Martinet <dominique.martinet@cea.fr>2016-02-02 15:44:07 +0100
commit89853188054e6e23182d8a6c26d1e1d2cb703e2e (patch)
treeaec8c732fbe9c9aeb14280e26345dd9b8279ab29
parent9729b396db5110222fe7c32f309fa03f4fc89141 (diff)
completion
-rw-r--r--host_config/bash_completion.d-kvm-wrapper17
1 files changed, 8 insertions, 9 deletions
diff --git a/host_config/bash_completion.d-kvm-wrapper b/host_config/bash_completion.d-kvm-wrapper
index ba59e17..5627c84 100644
--- a/host_config/bash_completion.d-kvm-wrapper
+++ b/host_config/bash_completion.d-kvm-wrapper
@@ -2,18 +2,17 @@
# Copyright (C) 2011 Dominique Martinet <asmadeus@codewreck.org>
# Published under the WTFPLv2 (see LICENSE)
-have kvm-wrapper &&
_kvm_wrapper()
{
local cur command vms
- local ROOTDIR=/usr/share/kvm-wrapper
+ local ROOTDIR=/etc/kvm-wrapper
COMPREPLY=()
cur=`_get_cword`
command=${COMP_WORDS[1]}
if [[ "$COMP_CWORD" == "1" ]]; then
- COMPREPLY=( $( compgen -W 'help attach create-desc start stop list screen create bootstrap remove edit create-disk status mount-disk umount-disk migrate receive-migrate save-state load-state balloon monitor serial conf top vncviewer' -- "$cur" ) )
+ COMPREPLY=( $( compgen -W 'help attach create-desc start stop list screen create bootstrap remove edit create-disk status mount-disk umount-disk migrate receive-migrate save-state load-state balloon monitor serial conf top vncviewer diag' -- "$cur" ) )
return 0
fi
@@ -35,20 +34,20 @@ _kvm_wrapper()
case "$command" in
start|screen|bootstrap|create-disk|remove|mount-disk|load-state)
if [[ -n "`\ls -1 $PID_DIR/*-vm.pid 2>/dev/null`" ]]; then
- vms=`\ls -1 $ROOTDIR/vm/*-vm|sed -e "s:$ROOTDIR/vm/::g" -e 's/-vm//g'|grep -v -x -F "$(\ls -1 $PID_DIR/*-vm.pid|sed -e "s@$PID_DIR/.*:@@g" -e 's/-vm.pid//g')"`
+ vms=`\ls -1 $VM_DIR/*-vm|sed -e "s:$VM_DIR/::g" -e 's/-vm//g'|grep -v -x -F "$(\ls -1 $PID_DIR/*-vm.pid|sed -e "s@$PID_DIR/.*:@@g" -e 's/-vm.pid//g')"`
else
- vms=`\ls -1 $ROOTDIR/vm/*-vm|sed -e "s:$ROOTDIR/vm/::g" -e 's/-vm//g'`
+ vms=`\ls -1 $VM_DIR/*-vm|sed -e "s:$VM_DIR/::g" -e 's/-vm//g'`
fi
COMPREPLY=( $( compgen -W "$vms" -- "$cur" ) )
return 0
;;
- stop|status|attach|migrate|save-state|balloon|monitor|serial|vncviewer)
+ stop|status|attach|migrate|save-state|balloon|monitor|serial|vncviewer|diag)
vms=`\ls -1 $PID_DIR/*-vm.pid 2>/dev/null |sed -e "s@$PID_DIR/.*:@@g" -e 's/-vm.pid//g'`
COMPREPLY=( $( compgen -W "$vms" -- "$cur" ) )
return 0
;;
edit)
- vms=`\ls -1 $ROOTDIR/vm/*-vm|sed -e "s:$ROOTDIR/vm/::g" -e 's/-vm//g'`
+ vms=`\ls -1 $VM_DIR/*-vm|sed -e "s:$VM_DIR/::g" -e 's/-vm//g'`
COMPREPLY=( $( compgen -W "$vms" -- "$cur" ) )
return 0
;;
@@ -69,7 +68,7 @@ _kvm_wrapper()
case "$command" in
migrate)
vms="${COMP_WORDS[2]}"
- . "$ROOTDIR/vm/$vms-vm"
+ . "$VM_DIR/$vms-vm"
# echo $KVM_CLUSTER_NODE -- $vms
local nodes=`grep -e '^set_cluster_host' $ROOTDIR/kvm-cluster.conf | cut -d' ' -f2 |grep -v $KVM_CLUSTER_NODE`
COMPREPLY=( $( compgen -W "$nodes" -- "$cur" ) )
@@ -80,7 +79,7 @@ _kvm_wrapper()
_expand || return 0
-} &&
+}
complete -F _kvm_wrapper $filenames kvm-wrapper
# Local variables: