mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2025-02-23 03:42:19 +00:00
7657804df7
Our vsh bash completion string is merely just a wrapper over virsh/virt-admin complete (cmdComplete) - a hidden command that uses internal readline completion to generate list of candidates. But this means that we have to pass some additional arguments to the helper process: e.g. connection URI and R/O flag. Candidates are printed on a separate line each (and can contain space), which means that when bash is reading the helper's output into an array, it needs to split items on '\n' char - hence the IFS=$'\n' prefix on the line executing the helper. This was introduced in b889594a70. But this introduced a regression - those extra arguments we might pass are stored in a string and previously were split on a space character (because $IFS was kept untouched and by default contains space). But now, after the fix that's no longer the case and thus virsh/virt-admin sees ' -r -c URI' as one argument. The solution is to take $IFS out of the picture by storing the extra arguments in an array instead of string. Fixes: b889594a7092440dc916e3f43eeeaca2684571ee Signed-off-by: Michal Privoznik <mprivozn@redhat.com> Reviewed-by: Erik Skultety <eskultet@redhat.com>
69 lines
2.1 KiB
Bash
69 lines
2.1 KiB
Bash
#
|
|
# virsh & virt-admin completion command
|
|
#
|
|
|
|
_vsh_complete()
|
|
{
|
|
local words cword c=0 i=0 cur RO URI CMDLINE INPUT A
|
|
|
|
# Here, $COMP_WORDS is an array of words on the bash
|
|
# command line that user wants to complete. However, when
|
|
# parsing command line, the default set of word breaks is
|
|
# applied. This doesn't work for us as it mangles libvirt
|
|
# arguments, e.g. connection URI (with the default set it's
|
|
# split into multiple items within the array). Fortunately,
|
|
# there's a fixup function for the array.
|
|
_get_comp_words_by_ref -n "\"'><=;|&(:" -w words -i cword
|
|
COMP_WORDS=( "${words[@]}" )
|
|
COMP_CWORD=${cword}
|
|
cur=${COMP_WORDS[$COMP_CWORD]}
|
|
|
|
# See what URI is user trying to connect to and if they are
|
|
# connecting RO. Honour that.
|
|
while [ $c -le $COMP_CWORD ]; do
|
|
word="${COMP_WORDS[c]}"
|
|
case "$word" in
|
|
-r|--readonly) RO=1 ;;
|
|
-c|--connect) c=$((++c)); URI=${COMP_WORDS[c]} ;;
|
|
*) if [ $c -ne 0 ] && [ $i -eq 0 ]; then i=$c; break; fi ;;
|
|
esac
|
|
c=$((++c))
|
|
done
|
|
|
|
CMDLINE=( )
|
|
if [ -n "${RO}" ]; then
|
|
CMDLINE+=("-r")
|
|
fi
|
|
if [ -n "${URI}" ]; then
|
|
CMDLINE+=("-c" "${URI}")
|
|
fi
|
|
|
|
INPUT=( "${COMP_WORDS[@]:$i:$COMP_CWORD}" )
|
|
INPUT[-1]=${INPUT[-1]//\\:/:}
|
|
|
|
# Uncomment these lines for easy debug.
|
|
# echo;
|
|
# echo "RO=${flag_ro}";
|
|
# echo "URI=${URI}";
|
|
# echo "CMDLINE=${CMDLINE}";
|
|
# echo "INPUT[${#INPUT[@]}]=**${INPUT[@]}**";
|
|
# echo "cur=${cur}";
|
|
# echo;
|
|
# return 0;
|
|
|
|
# Small shortcut here. According to manpage:
|
|
# When the function is executed, the first argument ($1) is
|
|
# the name of the command whose arguments are being
|
|
# completed.
|
|
# Therefore, we might just run $1.
|
|
IFS=$'\n' A=($($1 ${CMDLINE[@]} complete -- "${INPUT[@]}" 2>/dev/null))
|
|
|
|
COMPREPLY=($(compgen -W "${A[*]%--}" -- ${cur}))
|
|
__ltrim_colon_completions "$cur"
|
|
return 0
|
|
} &&
|
|
complete -o default -o filenames -F _vsh_complete virsh &&
|
|
complete -o default -o filenames -F _vsh_complete virt-admin
|
|
|
|
# vim: ft=sh:et:ts=4:sw=4:tw=80
|