build: Take extra tags in account for tar, zip

build.go

@@ -278,22 +278,18 @@ func main() {
 }
 
 func runCommand(cmd string, target target) {
+	var tags []string
+	if noupgrade {
+		tags = []string{"noupgrade"}
+	}
+	tags = append(tags, strings.Fields(extraTags)...)
+
 	switch cmd {
 	case "install":
-		var tags []string
-		if noupgrade {
-			tags = []string{"noupgrade"}
-		}
-		tags = append(tags, strings.Fields(extraTags)...)
 		install(target, tags)
 		metalintShort()
 
 	case "build":
-		var tags []string
-		if noupgrade {
-			tags = []string{"noupgrade"}
-		}
-		tags = append(tags, strings.Fields(extraTags)...)
 		build(target, tags)
 
 	case "test":
@@ -321,10 +317,10 @@ func runCommand(cmd string, target target) {
 		transifex()
 
 	case "tar":
-		buildTar(target)
+		buildTar(target, tags)
 
 	case "zip":
-		buildZip(target)
+		buildZip(target, tags)
 
 	case "deb":
 		buildDeb(target)
@@ -539,14 +535,15 @@ func appendParameters(args []string, tags []string, pkgs ...string) []string {
 	return append(args, pkgs...)
 }
 
-func buildTar(target target) {
+func buildTar(target target, tags []string) {
 	name := archiveName(target)
 	filename := name + ".tar.gz"
 
-	var tags []string
+	for _, tag := range tags {
-	if noupgrade {
+		if tag == "noupgrade" {
-		tags = []string{"noupgrade"}
+			name += "-noupgrade"
-		name += "-noupgrade"
+			break
+		}
 	}
 
 	build(target, tags)
@@ -562,14 +559,15 @@ func buildTar(target target) {
 	fmt.Println(filename)
 }
 
-func buildZip(target target) {
+func buildZip(target target, tags []string) {
 	name := archiveName(target)
 	filename := name + ".zip"
 
-	var tags []string
+	for _, tag := range tags {
-	if noupgrade {
+		if tag == "noupgrade" {
-		tags = []string{"noupgrade"}
+			name += "-noupgrade"
-		name += "-noupgrade"
+			break
+		}
 	}
 
 	build(target, tags)