Skip to content

Commit

Permalink
fix x86_64 vmware tools iso location
Browse files Browse the repository at this point in the history
Signed-off-by: Corey Hemminger <hemminger@hotmail.com>
  • Loading branch information
Stromweld committed Aug 10, 2023
1 parent 65faeb1 commit ec6124b
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 14 deletions.
13 changes: 0 additions & 13 deletions .goreleaser.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ builds:
- linux
goarch:
- amd64
- '386'
- arm
- arm64
ignore:
Expand Down Expand Up @@ -68,22 +67,10 @@ builds:
ldflags:
- '-s -w -X {{ .ModulePath }}/version.Version={{.Version}} -X {{ .ModulePath }}/version.VersionPrerelease= '
goos:
- netbsd
- openbsd
- freebsd
- windows
- solaris
goarch:
- amd64
- '386'
- arm
ignore:
- goos: windows
goarch: arm
- goos: solaris
goarch: arm
- goos: solaris
goarch: '386'
binary: '{{ .ProjectName }}_v{{ .Version }}_{{ .Env.API_VERSION }}_{{ .Os }}_{{ .Arch }}'
archives:
- format: zip
Expand Down
2 changes: 1 addition & 1 deletion builder/vmware/common/driver_fusion6.go
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ func (d *Fusion6Driver) ToolsIsoPath(k string) string {
if err := cmd.Run(); err != nil {
log.Printf("[DEBUG] failed to execute vmware-vmx command to get version %v", err)
log.Printf("[DEBUG] continuing with default iso path for fusion6+.")
return filepath.Join(d.AppPath, "Contents", "Library", "isoimages", "x86_64", k+".iso")
return filepath.Join(d.AppPath, "Contents", "Library", "isoimages", "x86_x64", k+".iso")
}
versionRe := regexp.MustCompile(`(?i)VMware [a-z0-9-]+ (\d+)\.`)
matches := versionRe.FindStringSubmatch(stderr.String())
Expand Down

0 comments on commit ec6124b

Please sign in to comment.