octoleo/syncthing
1
0
Fork 0
mirror of https://github.com/octoleo/syncthing.git synced 2024-12-31 22:11:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Call the darwin releases macosx instead

Browse Source
This commit is contained in:
Jakob Borg 2014-08-01 16:30:28 +02:00
parent f34f5e41a4
commit 43e7435c41
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build.sh
View File

@ -147,7 +147,7 @@ case "$1" in
build
eval $(go env)
name="syncthing-$GOOS-$GOARCH-$version"
name="syncthing-${GOOS/darwin/macosx}-$GOARCH-$version"
tarDist "$name"
;;
@ -163,7 +163,7 @@ case "$1" in
build
name="syncthing-$os-$version"
name="syncthing-${os/darwin/macosx}-$version"
case $GOOS in
windows)
zipDist "$name"

8
upgrade/upgrade_supported.go
View File

@ -32,7 +32,13 @@ func UpgradeTo(rel Release) error {
return err
}
expectedRelease := fmt.Sprintf("syncthing-%s-%s%s-%s.", runtime.GOOS, runtime.GOARCH, GoArchExtra, rel.Tag)
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, GoArchExtra, rel.Tag)
for _, asset := range rel.Assets {
if strings.HasPrefix(asset.Name, expectedRelease) {
if strings.HasSuffix(asset.Name, ".tar.gz") {