iSharkFly-Docs
/
packer-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1434 from frapposelli/fix-vmware-typos 

Fixed multiple VMware typos.
This commit is contained in:
Mitchell Hashimoto 2014-08-22 07:54:18 -07:00
parent 944d0e2ebf d2a9a98eeb
commit e3846e39c1
6 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
builder/vmware/common/driver.go
View File

@ -151,7 +151,7 @@ func normalizeVersion(version string) (string, error) {
i, err := strconv.Atoi(version) i, err := strconv.Atoi(version)
if err != nil { if err != nil {
return "", fmt.Errorf( return "", fmt.Errorf(
"VMWare version '%s' is not numeric", version) "VMware version '%s' is not numeric", version)
} }
return fmt.Sprintf("%02d", i), nil return fmt.Sprintf("%02d", i), nil
@ -170,7 +170,7 @@ func compareVersions(versionFound string, versionWanted string) error {
if found < wanted { if found < wanted {
return fmt.Errorf( return fmt.Errorf(
"VMWare WS version %s, or greater, is required. Found version: %s", versionWanted, versionFound) "VMware WS version %s, or greater, is required. Found version: %s", versionWanted, versionFound)
} }
return nil return nil

2
builder/vmware/common/driver_fusion5.go
View File

@ -12,7 +12,7 @@ import (
"github.com/mitchellh/multistep" "github.com/mitchellh/multistep"
) )
// Fusion5Driver is a driver that can run VMWare Fusion 5. // Fusion5Driver is a driver that can run VMware Fusion 5.
type Fusion5Driver struct { type Fusion5Driver struct {
// This is the path to the "VMware Fusion.app" // This is the path to the "VMware Fusion.app"
AppPath string AppPath string

2
builder/vmware/common/driver_fusion6.go
View File

@ -11,7 +11,7 @@ import (
"strings" "strings"
) )
// Fusion6Driver is a driver that can run VMWare Fusion 5. // Fusion6Driver is a driver that can run VMware Fusion 5.
type Fusion6Driver struct { type Fusion6Driver struct {
Fusion5Driver Fusion5Driver
} }

2
builder/vmware/common/driver_workstation9.go
View File

@ -23,7 +23,7 @@ type Workstation9Driver struct {
} }
func (d *Workstation9Driver) Clone(dst, src string) error { func (d *Workstation9Driver) Clone(dst, src string) error {
return errors.New("Cloning is not supported with VMWare WS version 9. Please use VMWare WS version 10, or greater.") return errors.New("Cloning is not supported with VMware WS version 9. Please use VMware WS version 10, or greater.")
} }
func (d *Workstation9Driver) CompactDisk(diskPath string) error { func (d *Workstation9Driver) CompactDisk(diskPath string) error {

6
builder/vmware/common/driver_workstation_unix.go
View File

@ -53,7 +53,7 @@ func workstationVmnetnatConfPath() string {
func workstationVerifyVersion(version string) error { func workstationVerifyVersion(version string) error {
if runtime.GOOS != "linux" { if runtime.GOOS != "linux" {
return fmt.Errorf("The VMWare WS version %s driver is only supported on Linux, and Windows, at the moment. Your OS: %s", version, runtime.GOOS) return fmt.Errorf("The VMware WS version %s driver is only supported on Linux, and Windows, at the moment. Your OS: %s", version, runtime.GOOS)
} }
//TODO(pmyjavec) there is a better way to find this, how? //TODO(pmyjavec) there is a better way to find this, how?
@ -71,9 +71,9 @@ func workstationVerifyVersion(version string) error {
matches := versionRe.FindStringSubmatch(stderr.String()) matches := versionRe.FindStringSubmatch(stderr.String())
if matches == nil { if matches == nil {
return fmt.Errorf( return fmt.Errorf(
"Could not find VMWare WS version in output: %s", stderr.String()) "Could not find VMware WS version in output: %s", stderr.String())
} }
log.Printf("Detected VMWare WS version: %s", matches[1]) log.Printf("Detected VMware WS version: %s", matches[1])
return compareVersions(matches[1], version) return compareVersions(matches[1], version)
} }

2
website/source/community/index.html.markdown
View File

@ -66,7 +66,7 @@ list as contributors come and go.
<div class="bio"> <div class="bio">
<h3>Ross Smith II (<a href="https://github.com/rasa" target="_blank">@rasa</a>)</h3> <h3>Ross Smith II (<a href="https://github.com/rasa" target="_blank">@rasa</a>)</h3>
<p> <p>
<a href="http://smithii.com/" target="_blank">Ross Smith</a> maintains our VMWare builder on Windows, and provides other valuable assistance. <a href="http://smithii.com/" target="_blank">Ross Smith</a> maintains our VMware builder on Windows, and provides other valuable assistance.
Ross is an open source enthusist, published author, and freelance consultant.</p> Ross is an open source enthusist, published author, and freelance consultant.</p>
</div> </div>
</div> </div>