perso/syncthing-arm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

build: Snap versions should not have initial "v"

Browse Source 
GitHub-Pull-Request: https://github.com/syncthing/syncthing/pull/3728
This commit is contained in:
Jakob Borg 2016-11-12 08:36:19 +00:00
parent 59f3d1445f
commit 72538e350d
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
build.go
View File

@ -527,7 +527,7 @@ func buildDeb(target target) {
func buildSnap(target target) { func buildSnap(target target) {
os.RemoveAll("snap") os.RemoveAll("snap")
tmpl, err := template.ParseFiles("snapcraft.yaml.template") tmpl, err := template.ParseFiles("snapcraft.yaml.template")
if err != nil { if err != nil {
log.Fatal(err) log.Fatal(err)
@ -541,9 +541,13 @@ func buildSnap(target target) {
snaparch := goarch snaparch := goarch
if snaparch == "armhf" { if snaparch == "armhf" {
goarch = "arm" goarch = "arm"
} }
snapver := version
if strings.HasPrefix(snapver, "v") {
snapver = snapver[1:]
}
err = tmpl.Execute(f, map[string]string{ err = tmpl.Execute(f, map[string]string{
"Version": version, "Version": snapver,
"Architecture": snaparch}) "Architecture": snaparch})
if err != nil { if err != nil {
log.Fatal(err) log.Fatal(err)