diff options
author | Jakob Borg <jakob@kastelo.net> | 2020-11-20 17:43:59 +0100 |
---|---|---|
committer | Jakob Borg <jakob@kastelo.net> | 2020-11-20 17:45:07 +0100 |
commit | b253022a968e1b444e832040e5ce34809aa0e5a9 (patch) | |
tree | 776ff2e5f242450e31ed04ea241817398952f013 /build.go | |
parent | db1f20603ae4700d2b2643ed45128d5febec69be (diff) | |
download | syncthing-b253022a968e1b444e832040e5ce34809aa0e5a9.tar.gz syncthing-b253022a968e1b444e832040e5ce34809aa0e5a9.zip |
build: Take extra tags in account for tar, zip
Diffstat (limited to 'build.go')
-rw-r--r-- | build.go | 42 |
1 files changed, 20 insertions, 22 deletions
@@ -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 - if noupgrade { - tags = []string{"noupgrade"} - name += "-noupgrade" + for _, tag := range tags { + if tag == "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 - if noupgrade { - tags = []string{"noupgrade"} - name += "-noupgrade" + for _, tag := range tags { + if tag == "noupgrade" { + name += "-noupgrade" + break + } } build(target, tags) |