Merge pull request #56 from rickard-von-essen/vargrant-prl

Improved Vagrant provider detection and support for parallels provider.
This commit is contained in:
Justin Hileman 2016-08-25 12:15:13 -07:00 committed by GitHub
commit ca7a3ecaa2

View File

@ -242,38 +242,59 @@ end
function __bobthefish_prompt_vagrant -S -d 'Display Vagrant status' function __bobthefish_prompt_vagrant -S -d 'Display Vagrant status'
[ "$theme_display_vagrant" = 'yes' -a -f Vagrantfile ]; or return [ "$theme_display_vagrant" = 'yes' -a -f Vagrantfile ]; or return
if type -q VBoxManage for machine in (__bobthefish_vagrant_machines)
__bobthefish_prompt_vagrant_vbox set -l provider (__bobthefish_vagrant_provider $machine)
else if grep vmware_fusion Vagrantfile >/dev/null ^&1 set -l id (__bobthefish_vagrant_id $machine $provider)
__bobthefish_prompt_vagrant_vmware if [ ! -z "$id" ]
switch "$provider"
case 'virtualbox'
__bobthefish_prompt_vagrant_vbox $id
case 'vmware_fusion'
__bobthefish_prompt_vagrant_vmware $id
case 'parallels'
__bobthefish_prompt_vagrant_parallels $id
end
end
end end
end end
function __bobthefish_vagrant_ids -S -d 'List Vagrant machine ids' function __bobthefish_vagrant_machines -S -d 'List all Vagrant machines'
for file in .vagrant/machines/**/id for machine in .vagrant/machines/*
read id <$file echo $machine | command sed -e 's/.*\/\(\w*\)/\1/'
end
end
function __bobthefish_vagrant_provider -S -a machine -d 'Get Vagrant provider for <machine>'
for provider in .vagrant/machines/$machine/*
if [ -e $provider/id ]
echo $provider/id | command sed -ne 's/.vagrant\/machines\/'$machine'\/\(.*\)\/id/\1/p'
end
end
end
function __bobthefish_vagrant_id -S -a machine -a provider -d 'List Vagrant machine id'
if [ -n "$provider" ]
read id < .vagrant/machines/$machine/$provider/id
echo $id echo $id
end end
end end
function __bobthefish_prompt_vagrant_vbox -S -d 'Display VirtualBox Vagrant status' function __bobthefish_prompt_vagrant_vbox -S -a id -d 'Display VirtualBox Vagrant status'
set -l vagrant_status set -l vagrant_status
for id in (__bobthefish_vagrant_ids) set -l vm_status (VBoxManage showvminfo --machinereadable $id ^/dev/null | command grep 'VMState=' | tr -d '"' | cut -d '=' -f 2)
set -l vm_status (VBoxManage showvminfo --machinereadable $id ^/dev/null | command grep 'VMState=' | tr -d '"' | cut -d '=' -f 2) switch "$vm_status"
switch "$vm_status" case 'running'
case 'running' set vagrant_status "$vagrant_status$__bobthefish_vagrant_running_glyph"
set vagrant_status "$vagrant_status$__bobthefish_vagrant_running_glyph" case 'poweroff'
case 'poweroff' set vagrant_status "$vagrant_status$__bobthefish_vagrant_poweroff_glyph"
set vagrant_status "$vagrant_status$__bobthefish_vagrant_poweroff_glyph" case 'aborted'
case 'aborted' set vagrant_status "$vagrant_status$__bobthefish_vagrant_aborted_glyph"
set vagrant_status "$vagrant_status$__bobthefish_vagrant_aborted_glyph" case 'saved'
case 'saved' set vagrant_status "$vagrant_status$__bobthefish_vagrant_saved_glyph"
set vagrant_status "$vagrant_status$__bobthefish_vagrant_saved_glyph" case 'stopping'
case 'stopping' set vagrant_status "$vagrant_status$__bobthefish_vagrant_stopping_glyph"
set vagrant_status "$vagrant_status$__bobthefish_vagrant_stopping_glyph" case ''
case '' set vagrant_status "$vagrant_status$__bobthefish_vagrant_unknown_glyph"
set vagrant_status "$vagrant_status$__bobthefish_vagrant_unknown_glyph"
end
end end
[ -z "$vagrant_status" ]; and return [ -z "$vagrant_status" ]; and return
@ -282,14 +303,36 @@ function __bobthefish_prompt_vagrant_vbox -S -d 'Display VirtualBox Vagrant stat
set_color normal set_color normal
end end
function __bobthefish_prompt_vagrant_vmware -S -d 'Display VMWare Vagrant status' function __bobthefish_prompt_vagrant_vmware -S -a id -d 'Display VMWare Vagrant status'
set -l vagrant_status set -l vagrant_status
for id in (__bobthefish_vagrant_ids) if [ (pgrep -f "$id") ]
if [ (pgrep -f "$id") ] set vagrant_status "$vagrant_status$__bobthefish_vagrant_running_glyph"
else
set vagrant_status "$vagrant_status$__bobthefish_vagrant_poweroff_glyph"
end
[ -z "$vagrant_status" ]; and return
__bobthefish_start_segment $__color_vagrant
echo -ns $vagrant_status ' '
set_color normal
end
function __bobthefish_prompt_vagrant_parallels -S -d 'Display Parallels Vagrant status'
set -l vagrant_status
set -l vm_status (prlctl list $id -o status ^/dev/null | command tail -1)
switch "$vm_status"
case 'running'
set vagrant_status "$vagrant_status$__bobthefish_vagrant_running_glyph" set vagrant_status "$vagrant_status$__bobthefish_vagrant_running_glyph"
else case 'stopped'
set vagrant_status "$vagrant_status$__bobthefish_vagrant_poweroff_glyph" set vagrant_status "$vagrant_status$__bobthefish_vagrant_poweroff_glyph"
end case 'paused'
set vagrant_status "$vagrant_status$__bobthefish_vagrant_saved_glyph"
case 'suspended'
set vagrant_status "$vagrant_status$__bobthefish_vagrant_saved_glyph"
case 'stopping'
set vagrant_status "$vagrant_status$__bobthefish_vagrant_stopping_glyph"
case ''
set vagrant_status "$vagrant_status$__bobthefish_vagrant_unknown_glyph"
end end
[ -z "$vagrant_status" ]; and return [ -z "$vagrant_status" ]; and return