Better bash completion for xen-create-image, by Nick Anderson.

AUTHORS

@@ -14,6 +14,9 @@ Contributions
   C.J. Adams-Collier <cjcollier [at] com.gmail.com
    - Added new modular structure to the code.
 
+  Nick Anderson  <nick [at] net.anders0n>
+   - Better bash completion for xen-create-image.
+
   Ray Anthracite <ray [at] com.rayanthracite>
    - Added support for EVMS installation types.
 

misc/xen-tools

@@ -133,7 +133,7 @@ _xen_create_image()
 	    return 0
 	    ;;
 	--role)
-	    roles=$(for x in `/bin/ls -1 /etc/xen-tools/role.d/ 2>/dev/null | grep -v \/ 2>/dev/null`; do echo ${x} ; done )
+            roles=$(ls -1 /etc/xen-tools/role.d/ | xargs echo )
 	    COMPREPLY=( $( compgen -W '${roles}'  -- "${COMP_WORDS[COMP_CWORD]}" ) )
 	    return 0
 	    ;;
@@ -144,7 +144,7 @@ _xen_create_image()
 	    ;;
     esac
     
-    if [[ ${cur} == -* ]]; then
+    if [[ ${cur} == -* ]] || [[ ${prev} == xen-create-image ]]; then
         COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) )
         return 0
     fi