From: Andrew Gerrand <adg@golang.org>
Date: Tue, 9 Apr 2013 08:17:55 +0000 (+1000)
Subject: dist: add .exe extension to tour.exe
X-Git-Tag: go1.1rc2~128
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=81063812b4e6923d079dd15bdede237072d4842f;p=gostls13.git

dist: add .exe extension to tour.exe

Fixes #5246.

R=golang-dev, dsymonds
CC=golang-dev
https://golang.org/cl/8558044
---

diff --git a/misc/dist/bindist.go b/misc/dist/bindist.go
index 831673d27c..19b0baac20 100644
--- a/misc/dist/bindist.go
+++ b/misc/dist/bindist.go
@@ -423,13 +423,13 @@ func (b *Build) tour() error {
 	}
 
 	// Copy gotour binary to tool directory as "tour"; invoked as "go tool tour".
-	gotour := "gotour"
+	ext := ""
 	if runtime.GOOS == "windows" {
-		gotour += ".exe"
+		ext = ".exe"
 	}
 	return cp(
-		filepath.Join(b.root, "pkg", "tool", b.OS+"_"+b.Arch, "tour"),
-		filepath.Join(b.gopath, "bin", gotour),
+		filepath.Join(b.root, "pkg", "tool", b.OS+"_"+b.Arch, "tour"+ext),
+		filepath.Join(b.gopath, "bin", "gotour"+ext),
 	)
 }