diff --git a/cmd/version.go b/cmd/version.go index 213610f3..cc3ff936 100644 --- a/cmd/version.go +++ b/cmd/version.go @@ -1,4 +1,4 @@ package cmd // Version - Wails version -const Version = "v0.13.0" +const Version = "v0.13.1" diff --git a/cmd/wails/8_update.go b/cmd/wails/8_update.go index eee501f6..1c1f6f62 100644 --- a/cmd/wails/8_update.go +++ b/cmd/wails/8_update.go @@ -107,10 +107,7 @@ func updateToVersion(targetVersion *cmd.SemanticVersion, force bool) error { if err != nil { return err } - success, err = targetVersion.IsGreaterThan(currentVersion) - if err != nil { - return err - } + success, _ = targetVersion.IsGreaterThan(currentVersion) } // Pre-Release -> Release = Massage target version to prerelease format if targetVersion.IsRelease() && currentVersion.IsPreRelease() { @@ -120,13 +117,15 @@ func updateToVersion(targetVersion *cmd.SemanticVersion, force bool) error { if err != nil { return err } - success, err = targetVersion.IsGreaterThanOrEqual(mainversion) - if err != nil { - return err - } + success, _ = targetVersion.IsGreaterThanOrEqual(mainversion) } - desiredVersion = "v" + targetVersion.String() + // Release -> Release = Standard check + if (targetVersion.IsRelease() && currentVersion.IsRelease()) || + (targetVersion.IsPreRelease() && currentVersion.IsPreRelease()) { + + success, _ = targetVersion.IsGreaterThan(currentVersion) + } // Compare if !success { @@ -134,6 +133,9 @@ func updateToVersion(targetVersion *cmd.SemanticVersion, force bool) error { logger.Red("If this is what you really want to do, use `wails update -version %s`", targetVersionString) return nil } + + desiredVersion = "v" + targetVersion.String() + } else { desiredVersion = "v" + targetVersion.String() }