Martchus
/
syncthing
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Find correct upgrade asset for arm (fixes #232)

This commit is contained in:
Jakob Borg 2014-05-20 00:06:16 +02:00
parent e359b146aa
commit a8c510cc72
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
build.sh
View File

@ -134,15 +134,20 @@ case "$1" in
export GOOS=linux
export GOARCH=arm
origldflags="$ldflags"
export GOARM=7
ldflags="$origldflags -X main.GoArchExtra v7"
build
tarDist "syncthing-linux-armv7-$version"
export GOARM=6
ldflags="$origldflags -X main.GoArchExtra v6"
build
tarDist "syncthing-linux-armv6-$version"
export GOARM=5
ldflags="$origldflags -X main.GoArchExtra v5"
build
tarDist "syncthing-linux-armv5-$version"

5
cmd/syncthing/upgrade_unix.go
View File

@ -30,6 +30,8 @@ type githubAsset struct {
Name string `json:"name"`
}
var GoArchExtra string // "", "v5", "v6", "v7"
func upgrade() error {
path, err := osext.Executable()
if err != nil {
@ -60,7 +62,7 @@ func upgrade() error {
return nil
}
expectedRelease := fmt.Sprintf("syncthing-%s-%s-%s.", runtime.GOOS, runtime.GOARCH, rel.Tag)
expectedRelease := fmt.Sprintf("syncthing-%s-%s%s-%s.", runtime.GOOS, runtime.GOARCH, GoArchExtra, rel.Tag)
for _, asset := range rel.Assets {
if strings.HasPrefix(asset.Name, expectedRelease) {
if strings.HasSuffix(asset.Name, ".tar.gz") {
@ -88,6 +90,7 @@ func upgrade() error {
}
}
l.Warnf("Found no asset for %q", expectedRelease)
return nil
}