docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

1434-Added homebrew cask support for VMware Fusion 

This aims to lookup for Vmware Fusion required binaries (vmrun and vmware-vdiskmanager) in the system path first before falling back in the default Vmware Fusion installing path.
Thereby, the vmwarefusion docker-machine driver can now be used even if Vmware Fusion is not installed in its default location (with brew cask for example).
Signed-off-by: Jean-Christophe Lagache <jclagache@gmail.com>
This commit is contained in:
jclagache 2015-09-06 00:34:57 +02:00
parent 08208bd141
commit ebbc45abea
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/vmwarefusion/vmrun_darwin.go
View File

@ -8,16 +8,16 @@ import (
"bytes" "bytes"
"errors" "errors"
"fmt" "fmt"
"github.com/docker/machine/log"
"os" "os"
"os/exec" "os/exec"
"path/filepath"
"strings" "strings"
"github.com/docker/machine/log"
) )
var ( var (
vmrunbin = "/Applications/VMware Fusion.app/Contents/Library/vmrun" vmrunbin = setVmwareCmd("vmrun")
vdiskmanbin = "/Applications/VMware Fusion.app/Contents/Library/vmware-vdiskmanager" vdiskmanbin = setVmwareCmd("vmware-vdiskmanager")
) )
var ( var (
@ -26,6 +26,14 @@ var (
ErrVMRUNNotFound = errors.New("VMRUN not found") ErrVMRUNNotFound = errors.New("VMRUN not found")
) )
// detect the vmrun and vmware-vdiskmanager cmds' path if needed
func setVmwareCmd(cmd string) string {
if path, err := exec.LookPath(cmd); err == nil {
return path
}
return filepath.Join("/Applications/VMware Fusion.app/Contents/Library/", cmd)
}
func vmrun(args ...string) (string, string, error) { func vmrun(args ...string) (string, string, error) {
cmd := exec.Command(vmrunbin, args...) cmd := exec.Command(vmrunbin, args...)
if os.Getenv("DEBUG") != "" { if os.Getenv("DEBUG") != "" {