Add support for container composed names.

When a container name has whitespace in it
(e.g. created by `lxc-create -t download -n "arch linux"` ),
the completion for other commands should be able to work by adding a
backslash to escape it.

Although it may be interesting to support names between quotes, this
would probably means to have to add quotes to all names. Might not be
interesting just due to an edge case.

Signed-off-by: Edênis Freindorfer Azevedo <edenisfa@gmail.com>

diff --git a/config/bash/lxc.in b/config/bash/lxc.in
index 2b88334226d6b2269585cff8f6e639a882702980..ecf2bb7e3c263fb90ff51d1d54fb8be5c0b50d7c 100644 (file)
--- a/config/bash/lxc.in
+++ b/config/bash/lxc.in
@@ -1,42 +1,55 @@
 # lxc-* commands completion
 
 _lxc_names() {
+    declare -a names
     case ${words[0]} in
         lxc-attach | lxc-cgroup | lxc-checkpoint | lxc-console | lxc-device | lxc-freeze | lxc-stop )
-            COMPREPLY=( $( compgen -W "$( command lxc-ls --running )" -- "$cur" ) )
+            mapfile -t names < <(command lxc-ls --running -1)
             ;;
         lxc-destroy | lxc-execute | lxc-snapshot | lxc-start )
-            COMPREPLY=( $( compgen -W "$( command lxc-ls --stopped )" -- "$cur" ) )
+            mapfile -t names < <(command lxc-ls --stopped -1)
             ;;
         lxc-copy | lxc-info | lxc-monitor | lxc-wait )
-            COMPREPLY=( $( compgen -W "$( command lxc-ls --defined )" -- "$cur" ) )
+            mapfile -t names < <(command lxc-ls --defined -1)
             ;;
         lxc-autostart | lxc-create | lxc-checkconfig | lxc-config | lxc-ls | \
         lxc-top | lxc-unshare | lxc-update-config | lxc-usernsexec )
             ;;
         lxc-unfreeze )
-            COMPREPLY=( $( compgen -W "$( command lxc-ls --frozen )" -- "$cur" ) )
+            mapfile -t names < <(command lxc-ls --frozen -1)
             ;;
         *)
             # If we are running as an alias or symlink with different name,
             # fallback to old behaviour.
-            COMPREPLY=( $( compgen -W "$( command lxc-ls )" -- "$cur" ) )
+            mapfile -t names < <(command lxc-ls -1)
             ;;
     esac
+
+    COMPREPLY=()
+    for i in "${!names[@]}"; do
+        # For composed names with spaces escaped by '\'.
+        names[${i}]=$(command printf "%q" "${names[${i}]}")
+        if [[ -n $(compgen -W "${names[${i}]}" -- "$cur") ]]; then
+            COMPREPLY+=("${names[${i}]}")
+        fi
+    done
 }
 
 _lxc_append_name() {
-    local vms=$(command lxc-ls)
+    mapfile -t names < <(command lxc-ls -1)
     local -r shortoptnamexp="^-[0-9A-Za-mo-z]*n[0-9A-Za-mo-z]*$"
+    local parsed
     # If `--name` or `-n` are present, do not complete with container names.
-    for param in ${words[@]}; do
-        if [[ ${param} =~ ^--name(=(.*))?$ ]]; then
+    for param in "${words[@]}"; do
+        # Parse names from command line when space is escaped by backslash.
+        parsed="${param//[\\]}"
+        if [[ ${parsed} =~ ^--name(=(.*))?$ ]]; then
             return
-        elif [[ ${param} =~ ${shortoptnamexp} ]]; then
+        elif [[ ${parsed} =~ ${shortoptnamexp} ]]; then
             return
         fi
-        for vm in ${vms[@]}; do
-            [[ "${param}" = "${vm}" ]] && return
+        for name in "${names[@]}"; do
+            [[ "${parsed}" = "${name}" ]] && return
         done
     done
     _lxc_names