mirror of
https://github.com/octoleo/syncthing.git
synced 2025-01-03 15:17:25 +00:00
Call the darwin releases macosx instead
This commit is contained in:
parent
f34f5e41a4
commit
43e7435c41
4
build.sh
4
build.sh
@ -147,7 +147,7 @@ case "$1" in
|
|||||||
build
|
build
|
||||||
|
|
||||||
eval $(go env)
|
eval $(go env)
|
||||||
name="syncthing-$GOOS-$GOARCH-$version"
|
name="syncthing-${GOOS/darwin/macosx}-$GOARCH-$version"
|
||||||
|
|
||||||
tarDist "$name"
|
tarDist "$name"
|
||||||
;;
|
;;
|
||||||
@ -163,7 +163,7 @@ case "$1" in
|
|||||||
|
|
||||||
build
|
build
|
||||||
|
|
||||||
name="syncthing-$os-$version"
|
name="syncthing-${os/darwin/macosx}-$version"
|
||||||
case $GOOS in
|
case $GOOS in
|
||||||
windows)
|
windows)
|
||||||
zipDist "$name"
|
zipDist "$name"
|
||||||
|
@ -32,7 +32,13 @@ func UpgradeTo(rel Release) error {
|
|||||||
return err
|
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 {
|
for _, asset := range rel.Assets {
|
||||||
if strings.HasPrefix(asset.Name, expectedRelease) {
|
if strings.HasPrefix(asset.Name, expectedRelease) {
|
||||||
if strings.HasSuffix(asset.Name, ".tar.gz") {
|
if strings.HasSuffix(asset.Name, ".tar.gz") {
|
||||||
|
Loading…
Reference in New Issue
Block a user