From: Andrew Gerrand <adg@golang.org>
Date: Thu, 26 Apr 2012 20:25:53 +0000 (-0700)
Subject: misc/dist: drop repetition in filenames, default to release tag
X-Git-Tag: go1.1rc2~3296
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=029d62f5c0c13caae47a9d9ab294fb5dba0884ef;p=gostls13.git

misc/dist: drop repetition in filenames, default to release tag

R=golang-dev, rsc
CC=golang-dev
https://golang.org/cl/6117066
---

diff --git a/misc/dist/bindist.go b/misc/dist/bindist.go
index b623449a4e..891397635b 100644
--- a/misc/dist/bindist.go
+++ b/misc/dist/bindist.go
@@ -29,7 +29,7 @@ import (
 )
 
 var (
-	tag      = flag.String("tag", "weekly", "mercurial tag to check out")
+	tag      = flag.String("tag", "release", "mercurial tag to check out")
 	repo     = flag.String("repo", "https://code.google.com/p/go", "repo URL")
 	verbose  = flag.Bool("v", false, "verbose output")
 	upload   = flag.Bool("upload", true, "upload resulting files to Google Code")
@@ -209,14 +209,20 @@ func (b *Build) Do() error {
 	}
 
 	// Create packages.
-	base := fmt.Sprintf("go.%s.%s-%s", version, b.OS, b.Arch)
+	base := fmt.Sprintf("%s.%s-%s", version, b.OS, b.Arch)
+	if !strings.HasPrefix(base, "go") {
+		base = "go." + base
+	}
 	var targs []string
 	switch b.OS {
 	case "linux", "freebsd", "":
 		// build tarball
 		targ := base
 		if b.Source {
-			targ = fmt.Sprintf("go.%s.src", version)
+			targ = fmt.Sprintf("%s.src", version)
+			if !strings.HasPrefix(targ, "go") {
+				targ = "go." + targ
+			}
 		}
 		targ += ".tar.gz"
 		err = makeTar(targ, work)