Browse Source

build: Snap versions should not have initial "v"

GitHub-Pull-Request: https://github.com/syncthing/syncthing/pull/3728
Jakob Borg 9 years ago
parent
commit
72538e350d
1 changed files with 7 additions and 3 deletions
  1. 7 3
      build.go

+ 7 - 3
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)