Compare commits

...

2 Commits

Author SHA1 Message Date
Lea Anthony
50e2037fba fix: same version comparison 2019-05-12 14:55:39 +10:00
Lea Anthony
f86c10af02 fix: update logic 2019-05-12 14:48:25 +10:00
2 changed files with 13 additions and 11 deletions

View File

@@ -1,4 +1,4 @@
package cmd
// Version - Wails version
const Version = "v0.13.0"
const Version = "v0.13.2"

View File

@@ -83,7 +83,7 @@ func updateToVersion(targetVersion *cmd.SemanticVersion, force bool) error {
var targetVersionString = "v" + targetVersion.String()
// Early exit
if targetVersion.String() == cmd.Version {
if targetVersionString == cmd.Version {
logger.Green("Looks like you're up to date!")
return nil
}
@@ -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()
}