From 72538e350de1727b5edd5fd8d70b777d1d58fd58 Mon Sep 17 00:00:00 2001 From: Jakob Borg Date: Sat, 12 Nov 2016 08:36:19 +0000 Subject: [PATCH] build: Snap versions should not have initial "v" GitHub-Pull-Request: https://github.com/syncthing/syncthing/pull/3728 --- build.go | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/build.go b/build.go index 6860db5f..f0731498 100644 --- a/build.go +++ b/build.go @@ -527,7 +527,7 @@ func buildDeb(target target) { func buildSnap(target target) { os.RemoveAll("snap") - + tmpl, err := template.ParseFiles("snapcraft.yaml.template") if err != nil { log.Fatal(err) @@ -541,9 +541,13 @@ func buildSnap(target target) { snaparch := goarch if snaparch == "armhf" { goarch = "arm" - } + } + snapver := version + if strings.HasPrefix(snapver, "v") { + snapver = snapver[1:] + } err = tmpl.Execute(f, map[string]string{ - "Version": version, + "Version": snapver, "Architecture": snaparch}) if err != nil { log.Fatal(err)