cmd/toolstash: fix windows executable name handling

Change-Id: I1ff643fae4c48b4f68b452eb6881fca99832930c
Reviewed-on: https://go-review.googlesource.com/c/tools/+/650915
Reviewed-by: Junyang Shao <[email protected]>
Reviewed-by: Michael Pratt <[email protected]>
Auto-Submit: Sean Liao <[email protected]>
Commit-Queue: Sean Liao <[email protected]>
Reviewed-by: Sean Liao <[email protected]>
LUCI-TryBot-Result: Go LUCI <[email protected]>

Author: egonelbre

cmd/toolstash/main.go

@@ -225,7 +225,7 @@ func main() {
 		return
 	}
 
-	tool = cmd[0]
+	tool = exeName(cmd[0])
 	if i := strings.LastIndexAny(tool, `/\`); i >= 0 {
 		tool = tool[i+1:]
 	}
@@ -530,7 +530,7 @@ func runCmd(cmd []string, keepLog bool, logName string) (output []byte, err erro
 		}()
 	}
 
-	xcmd := exec.Command(cmd[0], cmd[1:]...)
+	xcmd := exec.Command(exeName(cmd[0]), cmd[1:]...)
 	if !keepLog {
 		return xcmd.CombinedOutput()
 	}
@@ -571,9 +571,10 @@ func save() {
 		if !shouldSave(name) {
 			continue
 		}
-		src := filepath.Join(binDir, name)
+		bin := exeName(name)
+		src := filepath.Join(binDir, bin)
 		if _, err := os.Stat(src); err == nil {
-			cp(src, filepath.Join(stashDir, name))
+			cp(src, filepath.Join(stashDir, bin))
 		}
 	}
 
@@ -641,3 +642,10 @@ func cp(src, dst string) {
 		log.Fatal(err)
 	}
 }
+
+func exeName(name string) string {
+	if runtime.GOOS == "windows" {
+		return name + ".exe"
+	}
+	return name
+}