Merge pull request #1056 from carapace-sh/traverse-fix-gobindir

traverse: fix GoBinDir
carapace-sh · Nov 9, 2024 · 6ab8f31 · 6ab8f31
2 parents 45ee47a + 8404549
commit 6ab8f31
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/pkg/traverse/golang.go b/pkg/traverse/golang.go
@@ -8,6 +8,10 @@ import (
 
 // GoBinDir TODO experimental
 func GoBinDir(tc Context) (dir string, err error) {
+	if path, ok := tc.LookupEnv("GOBIN"); ok {
+		return filepath.ToSlash(path), nil
+	}
+
 	if path, ok := tc.LookupEnv("GOPATH"); ok {
 		dir = strings.Split(path, string(os.PathListSeparator))[0]
 	}
@@ -16,8 +20,8 @@ func GoBinDir(tc Context) (dir string, err error) {
 		if dir, err = UserHomeDir(tc); err != nil {
 			return "", err
 		}
-		dir += "/go"
+		dir = filepath.Join(dir, "go")
 	}
 
-	return filepath.ToSlash(dir) + "/bin", nil
+	return filepath.ToSlash(filepath.Join(dir, "bin")), nil
 }