more .exe suffixes, and lint fix

Signed-off-by: Will Murphy <[email protected]>
anchore · May 20, 2024 · ec21045 · ec21045
1 parent 7d1623d
commit ec21045
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/test/cli/trait_assertions_test.go b/test/cli/trait_assertions_test.go
@@ -2,7 +2,6 @@ package cli
 
 import (
 	"encoding/json"
-	"github.com/google/go-cmp/cmp"
 	"os"
 	"os/exec"
 	"path/filepath"
@@ -11,6 +10,7 @@ import (
 	"testing"
 
 	"github.com/acarl005/stripansi"
+	"github.com/google/go-cmp/cmp"
 	"github.com/stretchr/testify/require"
 )
 

diff --git a/tool/goinstall/installer.go b/tool/goinstall/installer.go
@@ -46,7 +46,7 @@ func (i Installer) InstallTo(version, destDir string) (string, error) {
 	binPath := filepath.Join(destDir, binName)
 	// TODO: probably refactor this somewhere
 	if runtime.GOOS == "windows" {
-		binPath = binPath + ".exe"
+		binPath = fmt.Sprintf("%s.exe", binPath)
 	}
 
 	spec := fmt.Sprintf("%s@%s", path, version)

diff --git a/tool/goinstall/installer_test.go b/tool/goinstall/installer_test.go
@@ -3,6 +3,7 @@ package goinstall
 import (
 	"fmt"
 	"os"
+	"runtime"
 	"strings"
 	"testing"
 
@@ -114,7 +115,11 @@ func TestInstaller_InstallTo(t *testing.T) {
 			if !tt.wantErr(t, err, fmt.Sprintf("InstallTo(%v, %v)", tt.args.version, tt.args.destDir)) {
 				return
 			}
-			assert.Equalf(t, tt.want, got, "InstallTo(%v, %v)", tt.args.version, tt.args.destDir)
+			wantPath := tt.want
+			if runtime.GOOS == "windows" {
+				wantPath = fmt.Sprintf("%s.exe", wantPath)
+			}
+			assert.Equalf(t, wantPath, got, "InstallTo(%v, %v)", tt.args.version, tt.args.destDir)
 		})
 	}
 }