Use runtime info to determine ARM version for upgrade (fixes #1051)

internal/upgrade/releasename_darwin.go

@@ -0,0 +1,25 @@
+// Copyright (C) 2014 The Syncthing Authors.
+//
+// This program is free software: you can redistribute it and/or modify it
+// under the terms of the GNU General Public License as published by the Free
+// Software Foundation, either version 3 of the License, or (at your option)
+// any later version.
+//
+// This program is distributed in the hope that it will be useful, but WITHOUT
+// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+// FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+// more details.
+//
+// You should have received a copy of the GNU General Public License along
+// with this program. If not, see <http://www.gnu.org/licenses/>.
+
+package upgrade
+
+import (
+	"fmt"
+	"runtime"
+)
+
+func releaseName(tag string) string {
+	return fmt.Sprintf("syncthing-macosx-%s-%s.", runtime.GOARCH, tag)
+}

internal/upgrade/releasename_linux_arm.go

@@ -0,0 +1,38 @@
+// Copyright (C) 2014 The Syncthing Authors.
+//
+// This program is free software: you can redistribute it and/or modify it
+// under the terms of the GNU General Public License as published by the Free
+// Software Foundation, either version 3 of the License, or (at your option)
+// any later version.
+//
+// This program is distributed in the hope that it will be useful, but WITHOUT
+// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+// FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+// more details.
+//
+// You should have received a copy of the GNU General Public License along
+// with this program. If not, see <http://www.gnu.org/licenses/>.
+
+package upgrade
+
+import (
+	"fmt"
+	"strings"
+	"syscall"
+)
+
+func releaseName(tag string) string {
+	return fmt.Sprintf("syncthing-linux-armv%s-%s.", goARM(), tag)
+}
+
+// Get the current ARM architecture version for upgrade purposes. If we can't
+// figure it out from the uname, default to ARMv6 (same as Go distribution).
+func goARM() string {
+	var name syscall.Utsname
+	syscall.Uname(&name)
+	machine := string(name.Machine[:5])
+	if strings.HasPrefix(machine, "armv") {
+		return machine[4:]
+	}
+	return "6"
+}

internal/upgrade/releasename_other.go

@@ -0,0 +1,27 @@
+// Copyright (C) 2014 The Syncthing Authors.
+//
+// This program is free software: you can redistribute it and/or modify it
+// under the terms of the GNU General Public License as published by the Free
+// Software Foundation, either version 3 of the License, or (at your option)
+// any later version.
+//
+// This program is distributed in the hope that it will be useful, but WITHOUT
+// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+// FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+// more details.
+//
+// You should have received a copy of the GNU General Public License along
+// with this program. If not, see <http://www.gnu.org/licenses/>.
+
+// +build !arm,!darwin
+
+package upgrade
+
+import (
+	"fmt"
+	"runtime"
+)
+
+func releaseName(tag string) string {
+	return fmt.Sprintf("syncthing-%s-%s-%s.", runtime.GOOS, runtime.GOARCH, tag)
+}

internal/upgrade/upgrade_common.go

@@ -48,7 +48,7 @@ func init() {
 }
 
 // A wrapper around actual implementations
-func UpgradeTo(rel Release, archExtra string) error {
+func UpgradeTo(rel Release) error {
 	select {
 	case <-upgradeUnlocked:
 		path, err := osext.Executable()
@@ -56,7 +56,7 @@ func UpgradeTo(rel Release, archExtra string) error {
 			upgradeUnlocked <- true
 			return err
 		}
-		err = upgradeTo(path, rel, archExtra)
+		err = upgradeTo(path, rel)
 		// If we've failed to upgrade, unlock so that another attempt could be made
 		if err != nil {
 			upgradeUnlocked <- true

internal/upgrade/upgrade_supported.go

@@ -28,19 +28,12 @@ import (
 	"os"
 	"path"
 	"path/filepath"
-	"runtime"
 	"strings"
 )
 
 // Upgrade to the given release, saving the previous binary with a ".old" extension.
-func upgradeTo(path string, rel Release, archExtra string) error {
-	osName := runtime.GOOS
-	if osName == "darwin" {
-		// We call the darwin release bundles macosx because that makes more
-		// sense for people downloading them
-		osName = "macosx"
-	}
-	expectedRelease := fmt.Sprintf("syncthing-%s-%s%s-%s.", osName, runtime.GOARCH, archExtra, rel.Tag)
+func upgradeTo(path string, rel Release) error {
+	expectedRelease := releaseName(rel.Tag)
 	if debug {
 		l.Debugf("expected release asset %q", expectedRelease)
 	}

internal/upgrade/upgrade_unsupp.go

@@ -17,7 +17,7 @@
 
 package upgrade
 
-func upgradeTo(path string, rel Release, extra string) error {
+func upgradeTo(path string, rel Release) error {
 	return ErrUpgradeUnsupported
 }
 

internal/upgrade/upgrade_windows.go

@@ -28,13 +28,12 @@ import (
 	"os"
 	"path"
 	"path/filepath"
-	"runtime"
 	"strings"
 )
 
 // Upgrade to the given release, saving the previous binary with a ".old" extension.
-func upgradeTo(path string, rel Release, archExtra string) error {
-	expectedRelease := fmt.Sprintf("syncthing-%s-%s%s-%s.", runtime.GOOS, runtime.GOARCH, archExtra, rel.Tag)
+func upgradeTo(path string, rel Release) error {
+	expectedRelease := releaseName(rel.Tag)
 	if debug {
 		l.Debugf("expected release asset %q", expectedRelease)
 	}