Bump to version 6.0.12.

Changed videocap to recording in modifyvm and controlvm, changed from
usb to usbohci in modifyvm command, added new movevm and mediumio
commands and cloud related options.
This commit is contained in:
2019-12-22 18:31:02 +01:00
parent 1be3e589d4
commit 10900543fa
2 changed files with 141 additions and 50 deletions

View File

@@ -6,7 +6,7 @@ script. However, in some point of time I've decided to rewrite it almost from
scratch. scratch.
Current version of script was written and tested against VBoxManage in version Current version of script was written and tested against VBoxManage in version
5.2.32, and supports all commands (in some extent ;)). 6.0.12, and should contain all commands and their options.
Unlike other attempts, I've tried to make the script context aware. See the 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: simple session with the VBoxManage command below, to have an idea how it works:

View File

@@ -4,7 +4,7 @@
# URL: https://bitbucket.org/gryf/vboxmanage-bash-completion # URL: https://bitbucket.org/gryf/vboxmanage-bash-completion
# URL: https://github.com/gryf/vboxmanage-bash-completion # URL: https://github.com/gryf/vboxmanage-bash-completion
# License: 3-clause BSD-style license (see LICENSE file) # License: 3-clause BSD-style license (see LICENSE file)
# Version: 5.2.32 # Version: 6.0.12
_VBoxManage() { _VBoxManage() {
local cur prev opts cmd subcommand tmp items name index result local cur prev opts cmd subcommand tmp items name index result
@@ -456,9 +456,9 @@ _VBoxManage() {
sort | \ sort | \
uniq) uniq)
# add debugvm command manually, since it's described differently in # add debugvm and mediumio commands manually, since it's described
# vboxmanage help # differently in vboxmanage help
opts="${opts} debugvm unattended" opts="${opts} mediumio debugvm unattended"
if [[ ${cur} == "-q" || ${COMP_CWORD} -eq 1 ]] ; then if [[ ${cur} == "-q" || ${COMP_CWORD} -eq 1 ]] ; then
COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) ) COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) )
@@ -583,7 +583,7 @@ _VBoxManage() {
;; ;;
--options) --options)
COMPREPLY=( $(compgen -W "link keepallmacs keepnatmacs COMPREPLY=( $(compgen -W "link keepallmacs keepnatmacs
keepdisknames" -- ${cur}) ) keepdisknames keephwuuids" -- ${cur}) )
;; ;;
--groups) --groups)
COMPREPLY=() COMPREPLY=()
@@ -641,18 +641,17 @@ _VBoxManage() {
setlinkstate3 setlinkstate4 setlinkstate5 setlinkstate6 setlinkstate3 setlinkstate4 setlinkstate5 setlinkstate6
setlinkstate7 setlinkstate8 setvideomodehint teleport unplugcpu setlinkstate7 setlinkstate8 setvideomodehint teleport unplugcpu
usbattach usbdetach vrde vrdeport vrdeproperty usbattach usbdetach vrde vrdeport vrdeproperty
vrdevideochannelquality webcam videocap videocapscreens vrdevideochannelquality webcam recording addencpassword
videocapfile videocapres videocaprate videocapfps removeencpassword removeallencpasswords keyboardputstring
videocapmaxtime videocapmaxsize addencpassword removeencpassword keyboardputfile audioin audioout setscreenlayout changeuartmode1
removeallencpasswords keyboardputstring keyboardputfile audioin changeuartmode2)
audioout)
_find_item_name 2 _find_item_name 2
subcommand=${COMP_WORDS[$((index+1))]} subcommand=${COMP_WORDS[$((index+1))]}
if [[ " ${items[@]} " == *" $subcommand "* ]]; then if [[ " ${items[@]} " == *" $subcommand "* ]]; then
case "${subcommand}" in case "${subcommand}" in
videocapfile|keyboardputfile|nictracefile[1-8]) keyboardputfile|nictracefile[1-8])
[[ ${prev} == "nictracefile"* ]] && \ [[ ${prev} == "nictracefile"* ]] && \
COMPREPLY=( $(compgen -f -- ${cur}) ) COMPREPLY=( $(compgen -f -- ${cur}) )
;; ;;
@@ -686,14 +685,28 @@ _VBoxManage() {
;; ;;
draganddrop) draganddrop)
[[ ${prev} == "draganddrop" ]] && \ [[ ${prev} == "draganddrop" ]] && \
COMPREPLY=( $(compgen -W "disabled hosttoguest COMPREPLY=( $(compgen -W "disabled hosttoguest
guesttohost bidirectional" -- ${cur}) ) guesttohost bidirectional" -- ${cur}) )
;; ;;
vrde|videocap) vrde)
[[ ${prev} == "vrde" || [[ ${prev} == "vrde" ]] && \
${prev} == "videocap" ]] && \
COMPREPLY=( $(compgen -W "on off" -- ${cur}) ) COMPREPLY=( $(compgen -W "on off" -- ${cur}) )
;; ;;
recording)
[[ ${prev} == "recording" ]] && \
COMPREPLY=( $(compgen -W "on off screens
filename videores videorate videofps maxtime
maxfilesize" -- ${cur}) )
case "${prev}" in
screens)
COMPREPLY=( $(compgen -W "all none
<screen>" -- ${cur}) )
;;
filename)
COMPREPLY=( $(compgen -f -- ${cur}) )
;;
esac
;;
videocapscreens) videocapscreens)
[[ ${prev} == "videocapscreens" ]] && \ [[ ${prev} == "videocapscreens" ]] && \
COMPREPLY=( $(compgen -W "all none" -- ${cur}) ) COMPREPLY=( $(compgen -W "all none" -- ${cur}) )
@@ -732,6 +745,12 @@ _VBoxManage() {
_get_excluded_items "${tmp[@]}" _get_excluded_items "${tmp[@]}"
COMPREPLY=( $(compgen -W "$result" -- ${cur}) ) COMPREPLY=( $(compgen -W "$result" -- ${cur}) )
;; ;;
changeuartmode[1-2])
tmp=(disconnected server client tcpserver tcpclient
file "<devicename>")
_get_excluded_items "${tmp[@]}"
COMPREPLY=( $(compgen -W "$result" -- ${cur}) )
;;
esac esac
elif [[ ${prev} == "--passwordfile" || ${prev} == "--capturefile" ]]; then elif [[ ${prev} == "--passwordfile" || ${prev} == "--capturefile" ]]; then
COMPREPLY=( $(compgen -f -- ${cur}) ) COMPREPLY=( $(compgen -f -- ${cur}) )
@@ -792,7 +811,7 @@ _VBoxManage() {
;; ;;
--variant) --variant)
COMPREPLY=( $(compgen -W "Standard Fixed Split2G COMPREPLY=( $(compgen -W "Standard Fixed Split2G
Stream ESX" -- ${cur}) ) Stream ESX Formatted" -- ${cur}) )
;; ;;
esac esac
;; ;;
@@ -801,7 +820,8 @@ _VBoxManage() {
;; ;;
createvm) createvm)
items=(--name --groups --ostype --register --basefolder --uuid) items=(--name --groups --ostype --register --basefolder --uuid
--default)
if [[ ${prev} == ${cmd} ]]; then if [[ ${prev} == ${cmd} ]]; then
COMPREPLY=( $(compgen -W "${items[*]}" -- ${cur}) ) COMPREPLY=( $(compgen -W "${items[*]}" -- ${cur}) )
else else
@@ -887,7 +907,7 @@ _VBoxManage() {
if [[ " ${items[@]} " == *" $subcommand "* ]]; then if [[ " ${items[@]} " == *" $subcommand "* ]]; then
case "${subcommand}" in case "${subcommand}" in
add|modify) add|modify)
items=(--ip --netmask --lowerip --upperip) items=(--ip --netmask --lowerip --upperip --options)
[[ " ${COMP_WORDS[@]} " != *" --ifname"* && [[ " ${COMP_WORDS[@]} " != *" --ifname"* &&
" ${COMP_WORDS[@]} " != *" --netname"* ]] && " ${COMP_WORDS[@]} " != *" --netname"* ]] &&
@@ -897,6 +917,9 @@ _VBoxManage() {
" ${COMP_WORDS[@]} " != *" --disable"* ]] && " ${COMP_WORDS[@]} " != *" --disable"* ]] &&
items+=(--enable --disable) items+=(--enable --disable)
[[ " ${COMP_WORDS[@]} " == *" --options"* ]] &&
items+=(--vm --nic --id --value --remove)
_get_excluded_items "${items[@]}" _get_excluded_items "${items[@]}"
COMPREPLY=( $(compgen -W "$result" -- ${cur}) ) COMPREPLY=( $(compgen -W "$result" -- ${cur}) )
;; ;;
@@ -945,11 +968,15 @@ _VBoxManage() {
;; ;;
"export") "export")
items=( --manifest --iso --options --vsys) items=( --manifest --iso --options --vsys --cloud)
if [[ ${prev} == ${cmd} ]]; then if [[ ${prev} == ${cmd} ]]; then
_vms_comp vms _vms_comp vms
elif [[ ${prev} == "--eulafile" ]]; then elif [[ ${prev} == "--eulafile" ]]; then
COMPREPLY=( $(compgen -f -- ${cur}) ) COMPREPLY=( $(compgen -f -- ${cur}) )
elif [[ ${prev} == "--cloudkeepobject" ||
${prev} == "--cloudlaunchinstance" ||
${prev} == "--cloudpublicip" ]]; then
COMPREPLY=( $(compgen -W "true false" -- ${cur}) )
else else
[[ " ${COMP_WORDS[@]} " != *" -o "* && [[ " ${COMP_WORDS[@]} " != *" -o "* &&
" ${COMP_WORDS[@]} " != *" --output "* ]] && " ${COMP_WORDS[@]} " != *" --output "* ]] &&
@@ -962,7 +989,11 @@ _VBoxManage() {
items+=(--legacy09 --ovf09 --ovf10 --ovf20 --opc10) items+=(--legacy09 --ovf09 --ovf10 --ovf20 --opc10)
[[ " ${COMP_WORDS[@]} " == *" --vsys "* ]] && [[ " ${COMP_WORDS[@]} " == *" --vsys "* ]] &&
items+=(--product --producturl --vendor --vendorurl items+=(--product --producturl --vendor --vendorurl
--version --description --eula --eulafile) --version --description --eula --eulafile --vmname)
[[ " ${COMP_WORDS[@]} " == *" --cloud"* ]] &&
items+=(--vmname --cloudprofile --cloudshape --clouddomain
--clouddisksize --cloudbucket --cloudocivcn --cloudocisubnet
--cloudkeepobject --cloudlaunchinstance --cloudpublicip)
_get_excluded_items "${items[@]}" _get_excluded_items "${items[@]}"
COMPREPLY=( $(compgen -W "$result" -- ${cur}) ) COMPREPLY=( $(compgen -W "$result" -- ${cur}) )
@@ -971,6 +1002,7 @@ _VBoxManage() {
COMPREPLY=( $(compgen -W "manifest iso nomacs COMPREPLY=( $(compgen -W "manifest iso nomacs
nomacsbutnat" -- ${cur}) ) nomacsbutnat" -- ${cur}) )
;; ;;
esac esac
[[ ${#COMPREPLY[@]} -eq 0 ]] && \ [[ ${#COMPREPLY[@]} -eq 0 ]] && \
COMPREPLY=( $(compgen -W "${items[*]}" -- ${cur}) ) COMPREPLY=( $(compgen -W "${items[*]}" -- ${cur}) )
@@ -1075,8 +1107,8 @@ _VBoxManage() {
;; ;;
copyfrom|copyto) copyfrom|copyto)
items=(--dryrun --follow --target-directory items=(--follow --target-directory --username
--username --domain) --domain)
[[ " ${COMP_WORDS[@]} " != *" --recursive "* && [[ " ${COMP_WORDS[@]} " != *" --recursive "* &&
" ${COMP_WORDS[@]} " != *" -R "* ]] && " ${COMP_WORDS[@]} " != *" -R "* ]] &&
@@ -1438,6 +1470,31 @@ _VBoxManage() {
fi fi
;; ;;
mediumio)
if [[ ${prev} == ${cmd} ]]; then
_hdd_comp
_floppy_comp
_dvds_comp
else
case "${prev}" in
formatfat)
COMPREPLY=( $(compgen -W "--quick" -- ${cur}) )
;;
cat)
COMPREPLY=( $(compgen -W "--hex --offset --size
--output" -- ${cur}) )
;;
stream)
COMPREPLY=( $(compgen -W "--forma --variant
--output" -- ${cur}) )
;;
*)
COMPREPLY=( $(compgen -W "--password-file cat formatfat
stream" -- ${cur}) )
esac
fi
;;
mediumproperty) mediumproperty)
if [[ ${prev} == ${cmd} ]]; then if [[ ${prev} == ${cmd} ]]; then
COMPREPLY=( $(compgen -W "disk dvd floppy" -- ${cur}) ) COMPREPLY=( $(compgen -W "disk dvd floppy" -- ${cur}) )
@@ -1525,7 +1582,7 @@ _VBoxManage() {
*) *)
_find_item_name 2 _find_item_name 2
items=(--type --autoreset --property --compact --resize items=(--type --autoreset --property --compact --resize
--move --description) --move --description --setlocation)
_get_excluded_items "${items[@]}" _get_excluded_items "${items[@]}"
COMPREPLY=( $(compgen -W "$result" -- ${cur}) ) COMPREPLY=( $(compgen -W "$result" -- ${cur}) )
case "${prev}" in case "${prev}" in
@@ -1540,6 +1597,9 @@ _VBoxManage() {
--move) --move)
COMPREPLY=( $(compgen -o dirnames -- ${cur}) ) COMPREPLY=( $(compgen -o dirnames -- ${cur}) )
;; ;;
--setlocation)
COMPREPLY=( $(compgen -f -- ${cur}) )
;;
esac esac
;; ;;
esac esac
@@ -1610,18 +1670,19 @@ _VBoxManage() {
--audiocontroller --clipboard --draganddrop --vrde --vrdeextpack --audiocontroller --clipboard --draganddrop --vrde --vrdeextpack
--vrdeproperty --vrdeport --vrdeaddress --vrdeauthtype --vrdeproperty --vrdeport --vrdeaddress --vrdeauthtype
--vrdeauthlibrary --vrdemulticon --vrdereusecon --vrdevideochannel --vrdeauthlibrary --vrdemulticon --vrdereusecon --vrdevideochannel
--vrdevideochannelquality --usb --usbehci --snapshotfolder --vrdevideochannelquality --usbohci --usbehci --snapshotfolder
--teleporter --teleporterport --teleporteraddress --teleporter --teleporterport --teleporteraddress
--teleporterpassword --teleporterpasswordfile --tracing-enabled --teleporterpassword --teleporterpasswordfile --tracing-enabled
--tracing-config --tracing-allow-vm-access --usbcardreader --tracing-config --tracing-allow-vm-access --usbcardreader
--autostart-enabled --autostart-delay --videocap --videocapscreens --autostart-enabled --autostart-delay --recording --recordingscreens
--videocapfile --videocapres --videocaprate --videocapfps --recordingfile --recordingvideores --recordingvideorate
--videocapmaxtime --videocapmaxsize --videocapopts --defaultfrontend --recordingvideofps --recordingmaxtime --recordingmaxsize
--cpuid-portability-level --paravirtprovider --audiocodec --usbxhci --recordingopts --defaultfrontend --cpuid-portability-level
--usbrename --apic --x2apic --paravirtdebug --cpu-profile --paravirtprovider --audiocodec --usbxhci --usbrename --apic
--biosapic --ibpb-on-vm-entry --ibpb-on-vm-exit --spec-ctrl --x2apic --paravirtdebug --cpu-profile --biosapic --ibpb-on-vm-entry
--audioin --audioout --l1d-flush-on-sched --ibpb-on-vm-exit --spec-ctrl --audioin --audioout
--l1d-flush-on-vm-entry --mds-clear-on-sched --mds-clear-on-vm-entry) --l1d-flush-on-sched --l1d-flush-on-vm-entry --mds-clear-on-sched
--mds-clear-on-vm-entry --nested-hw-virt --uarttype1 --uarttype2)
if [[ ${prev} == ${cmd} ]]; then if [[ ${prev} == ${cmd} ]]; then
_vms_comp vms _vms_comp vms
@@ -1657,18 +1718,19 @@ _VBoxManage() {
--natdnshostresolver3|--natdnshostresolver4|\ --natdnshostresolver3|--natdnshostresolver4|\
--natdnshostresolver5|--natdnshostresolver6|\ --natdnshostresolver5|--natdnshostresolver6|\
--natdnshostresolver7|--natdnshostresolver8|--vrde|\ --natdnshostresolver7|--natdnshostresolver8|--vrde|\
--vrdemulticon|--vrdereusecon|--vrdevideochannel|--usb|\ --vrdemulticon|--vrdereusecon|--vrdevideochannel|--usbohci|\
--usbehci|--teleporter|--tracing-enabled|\ --usbehci|--teleporter|--tracing-enabled|\
--tracing-allow-vm-access|--usbcardreader|\ --tracing-allow-vm-access|--usbcardreader|\
--autostart-enabled|--videocap|--usbxhci|--apic|--x2apic|\ --autostart-enabled|--recording|--usbxhci|--apic|--x2apic|\
--ibpb-on-vm-entry|--ibpb-on-vm-exit|--spec-ctrl|--audioin|\ --ibpb-on-vm-entry|--ibpb-on-vm-exit|--spec-ctrl|--audioin|\
--audioout|--l1d-flush-on-sched|--l1d-flush-on-vm-entry|\ --audioout|--l1d-flush-on-sched|--l1d-flush-on-vm-entry|\
--mds-clear-on-sched|--mds-clear-on-vm-entry) --mds-clear-on-sched|--mds-clear-on-vm-entry|\
--nested-hw-virt)
COMPREPLY=( $(compgen -W "on off" -- ${cur}) ) COMPREPLY=( $(compgen -W "on off" -- ${cur}) )
;; ;;
--graphicscontroller) --graphicscontroller)
COMPREPLY=( $(compgen -W "none vboxvga vmsvga" \ COMPREPLY=( $(compgen -W "none vboxvga vmsvga vboxsvga" \
-- ${cur}) ) -- ${cur}) )
;; ;;
@@ -1772,6 +1834,11 @@ _VBoxManage() {
tcpserver tcpclient file" -- ${cur}) ) tcpserver tcpclient file" -- ${cur}) )
;; ;;
--uarttype[1-2])
COMPREPLY=( $(compgen -W "16450 16550A
16750" -- ${cur}) )
;;
--audio) --audio)
COMPREPLY+=( $(compgen -W "none null oss alsa pulse" \ COMPREPLY+=( $(compgen -W "none null oss alsa pulse" \
-- ${cur}) ) -- ${cur}) )
@@ -1792,7 +1859,7 @@ _VBoxManage() {
;; ;;
--draganddrop) --draganddrop)
COMPREPLY+=( $(compgen -W "disabled hosttoguest COMPREPLY+=( $(compgen -W "disabled hosttoguest
guesttohost bidirectional" -- ${cur}) ) guesttohost bidirectional" -- ${cur}) )
;; ;;
@@ -1824,7 +1891,7 @@ _VBoxManage() {
COMPREPLY=( $(compgen -W "disabled apic x2apic" \ COMPREPLY=( $(compgen -W "disabled apic x2apic" \
-- ${cur}) ) -- ${cur}) )
;; ;;
--teleporterpasswordfile|--iconfile|--videocapfile) --teleporterpasswordfile|--iconfile|--recordingfile)
COMPREPLY=( $(compgen -f -- ${cur}) ) COMPREPLY=( $(compgen -f -- ${cur}) )
;; ;;
--nictracefile[1-8]) --nictracefile[1-8])
@@ -1837,6 +1904,26 @@ _VBoxManage() {
fi fi
;; ;;
movevm)
if [[ ${prev} == ${cmd} ]]; then
_vms_comp vms
else
_find_item_name 2
items=(--type --folder)
_get_excluded_items "${items[@]}"
COMPREPLY=( $(compgen -W "$result" -- ${cur}) )
case "${prev}" in
--type)
COMPREPLY=( $(compgen -W "basic" -- ${cur}) )
_snapshot_comp
;;
--folder)
COMPREPLY=( $(compgen -f -- ${cur}) )
;;
esac
fi
;;
natnetwork) natnetwork)
items=(add remove modify start stop list) items=(add remove modify start stop list)
subcommand=${COMP_WORDS[2]} subcommand=${COMP_WORDS[2]}
@@ -1889,7 +1976,7 @@ _VBoxManage() {
setproperty) setproperty)
items=(machinefolder hwvirtexclusive vrdeauthlibrary items=(machinefolder hwvirtexclusive vrdeauthlibrary
websrvauthlibrary vrdeextpack autostartdbpath loghistorycount websrvauthlibrary vrdeextpack autostartdbpath loghistorycount
defaultfrontend logginglevel) defaultfrontend logginglevel proxymode proxyurl)
subcommand=${COMP_WORDS[2]} subcommand=${COMP_WORDS[2]}
if [[ "${prev}" == "${cmd}" ]]; then if [[ "${prev}" == "${cmd}" ]]; then
COMPREPLY=( $(compgen -W "${items[*]}" -- ${cur}) ) COMPREPLY=( $(compgen -W "${items[*]}" -- ${cur}) )
@@ -1916,6 +2003,10 @@ _VBoxManage() {
defaultfrontend) defaultfrontend)
COMPREPLY=( $(compgen -W "null" -- ${cur}) ) COMPREPLY=( $(compgen -W "null" -- ${cur}) )
;; ;;
proxymode)
COMPREPLY=( $(compgen -W "system noproxy
manual" -- ${cur}) )
;;
esac esac
fi fi
;; ;;
@@ -2241,17 +2332,17 @@ _VBoxManage() {
if [[ ${prev} == ${subcommand} ]]; then if [[ ${prev} == ${subcommand} ]]; then
_vms_comp vms _vms_comp vms
else else
local items=(--iso --user=login local items=(--iso --user=login
--password=password --password-file --password=password --password-file
--full-user-name --key --full-user-name --key
--install-additions --no-install-additions --install-additions --no-install-additions
--additions-iso --install-txs --no-install-txs --additions-iso --install-txs --no-install-txs
--validation-kit-iso --locale --country --validation-kit-iso --locale --country
--time-zone --hostname --time-zone --hostname
--package-selection-adjustment --dry-run --package-selection-adjustment --dry-run
--auxiliary-base-path=path --image-index --auxiliary-base-path=path --image-index
--script-template --post-install-template --script-template --post-install-template
--post-install-command --post-install-command
--extra-install-kernel-parameters --language --extra-install-kernel-parameters --language
--start-vm) --start-vm)
_get_excluded_items "${items[@]}" _get_excluded_items "${items[@]}"