Merge pull request #15 from borekon/patch-1

added the ubuntu default bash completion folder

README.rst

@@ -6,7 +6,7 @@ script. However, in some point of time I've decided to rewrite it almost from
 scratch.
 
 Current version of script was written and tested against VBoxManage in version
-7.0.8, and should contain all commands and their options.
+7.0.22, and should contain all commands and their options.
 
 Unlike other attempts, I've tried to make the script context aware. See the
 simple session with the VBoxManage command below, to have an idea how it works:
@@ -42,6 +42,7 @@ be:
 * ~/bash-completion.d/
 * /usr/local/etc/bash-completion.d/
 * /etc/bash_completion.d/
+* ~/.local/share/bash-completion
 * etc.
 
 It's also okay to copy it into some directory, and place proper line in

VBoxManage

@@ -1,10 +1,9 @@
 # bash command-line completion for VBoxManage command
 #
 # Author: Roman 'gryf' Dobosz <gryf73@gmail.com>
-# URL: https://bitbucket.org/gryf/vboxmanage-bash-completion
 # URL: https://github.com/gryf/vboxmanage-bash-completion
 # License: 3-clause BSD-style license (see LICENSE file)
-# Version: 7.0.8
+# Version: 7.0.22
 
 
 _VBoxManage() {
@@ -164,8 +163,8 @@ _VBoxManage() {
         compopt -o filenames
 
         vms=$(VBoxManage list vms -l | \
-            egrep '^Name|State' | \
+            grep -E '^Name|State' | \
-            egrep -B1 'State:\s+saved' | \
+            grep -E -B1 'State:\s+saved' | \
             grep Name |$VBMC_SED 's/Name:\s\+//' | \
             tr '\n' '|' | \
             $VBMC_SED 's/|$//' | \
@@ -199,7 +198,7 @@ _VBoxManage() {
         local item
 
         list=$(VBoxManage list ostypes | \
-            egrep ^ID: | \
+            grep -E ^ID: | \
             $VBMC_SED 's/ID:\s\+//' | \
             tr '\n' '|' | \
             $VBMC_SED 's/|$//')
@@ -234,7 +233,7 @@ _VBoxManage() {
         local item
 
         list=$(VBoxManage list hostonlyifs | \
-            egrep ^Name: | \
+            grep -E ^Name: | \
             $VBMC_SED 's/Name:\s\+//' | \
             $VBMC_SED 's/\s/\\ /g'| \
             tr '\n' '|' | \
@@ -377,7 +376,7 @@ _VBoxManage() {
         local item
 
         list=$(VBoxManage list bridgedifs | \
-            egrep ^Name: | \
+            grep -E ^Name: | \
             $VBMC_SED 's/Name:\s\+//' | \
             $VBMC_SED 's/\s/\\ /g'| \
             tr '\n' '|' | \
@@ -395,7 +394,7 @@ _VBoxManage() {
         local item
 
         list=$(VBoxManage list intnets| \
-            egrep ^Name: | \
+            grep -E ^Name: | \
             $VBMC_SED 's/Name:\s\+//' | \
             $VBMC_SED 's/\s/\\ /g'| \
             tr '\n' '|' | \
@@ -677,11 +676,12 @@ _VBoxManage() {
                     _cloudprofiles_comp
                     ;;
                 list)
-                    COMPREPLY=( $(compgen -W "instances images" -- ${cur}) )
+                    COMPREPLY=( $(compgen -W "instances images vnicattachments"
+                        -- ${cur}) )
                     ;;
                 instance)
                     COMPREPLY=( $(compgen -W "create info terminate start
-                        pause" -- ${cur}) )
+                        pause reset" -- ${cur}) )
                     ;;
                 image)
                     COMPREPLY=( $(compgen -W "create info delete import
@@ -692,6 +692,13 @@ _VBoxManage() {
                         COMPREPLY=( $(compgen -W "setup create" -- ${cur}) )
                     fi
                     ;;
+                reset)
+                    COMPREPLY=( $(compgen -W "--id" -- ${cur}) )
+                    ;;
+                vnicattachments)
+                    COMPREPLY=( $(compgen -W "--compartment-id --filter"
+                        -- ${cur}) )
+                    ;;
             esac
             if [[ " ${COMP_WORDS[*]} " == *" list images"* ||
                 " ${COMP_WORDS[*]} " == *" list instances"* ]]; then
@@ -1038,7 +1045,7 @@ _VBoxManage() {
             ;;
 
         createvm)
-            items=( --basefolder --cipher --default --group --name --ostype
+            items=( --basefolder --cipher --default --groups --name --ostype
                 --password-id --password --register --uuid )
             if [[ ${prev} == ${cmd} ]]; then
                 COMPREPLY=( $(compgen -W "${items[*]}" -- ${cur}) )
@@ -1047,7 +1054,7 @@ _VBoxManage() {
                 COMPREPLY=( $(compgen -W "$result" -- ${cur}) )
 
                 case "${prev}" in
-                    --group)
+                    --groups)
                         COMPREPLY=()
                         _group_comp
                         ;;
@@ -1425,7 +1432,7 @@ _VBoxManage() {
                 if [[ " ${items[*]} " == *" $subcommand "* ]]; then
                     case "${subcommand}" in
                         run)
-                            items=( --domain --dos2unix --exe
+                            items=( --arg0 --domain --dos2unix --exe
                                 --ignore-operhaned-processes --profile --putenv
                                 --quiet --timeout --unix2dos --unquoted-args
                                 --username --verbose -- )
@@ -1445,9 +1452,10 @@ _VBoxManage() {
                             ;;
 
                         start)
-                            items=( --domain --exe --ignore-orphaned-processes
+                            items=( --arg0 --domain --exe
-                                --profile --putenv --quiet --timeout
+                                --ignore-orphaned-processes --profile --putenv
-                                --unquoted-args --username --verbose -- )
+                                --quiet --timeout --unquoted-args --username
+                                --verbose -- )
 
                             [[ " ${COMP_WORDS[*]} " != *" --password "* ||
                                 " ${COMP_WORDS[*]} " != *" --passwordfile "* ]] &&
@@ -2855,4 +2863,9 @@ _VBoxManage() {
 complete -o default -F _VBoxManage VBoxManage
 complete -o default -F _VBoxManage vboxmanage
 
+if [[ "${BASH_SOURCE[0]}" != 'VBoxManage' &&
+    "${BASH_SOURCE[0]}" != 'vboxmanage' ]]; then
+    complete -o default -F _VBoxManage $(basename "${BASH_SOURCE[0]}")
+fi
+
 # vim: set ft=sh tw=80 sw=4 et :