mirror/opencloud
1
0
Fork 0
mirror of https://github.com/opencloud-eu/opencloud.git synced 2026-04-14 04:17:36 -04:00
Code Issues Packages Projects Releases Wiki Activity

parse legacy version too

Browse Source
This commit is contained in:
Michael Barz
2022-05-19 08:08:16 +02:00
parent a70dc22597
commit 7c6aecc8a2
2 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
extensions/frontend/pkg/revaconfig/config.go
View File

@@ -216,9 +216,9 @@ func FrontendConfigFromStruct(cfg *config.Config) map[string]interface{} {
"version": map[string]interface{}{
"product": "Infinite Scale",
"edition": "Community",
"major": version.Parsed().Major(),
"minor": version.Parsed().Minor(),
"micro": version.Parsed().Patch(),
"major": version.ParsedLegacy().Major(),
"minor": version.ParsedLegacy().Minor(),
"micro": version.ParsedLegacy().Patch(),
"string": version.LegacyString,
},
},

13
ocis-pkg/version/version.go
View File

@@ -1,7 +1,6 @@
package version
import (
"strconv"
"time"
"github.com/Masterminds/semver"
@@ -50,9 +49,11 @@ func Parsed() *semver.Version {
return parsedVersion
}
// Long returns the legacy version with 4 number parts like 10.9.8.0
func Long() string {
return strconv.FormatInt(Parsed().Major(), 10) + "." +
strconv.FormatInt(Parsed().Minor(), 10) + "." +
strconv.FormatInt(Parsed().Patch(), 10) + "." + "0"
// ParsedLegacy returns the legacy version
func ParsedLegacy() *semver.Version {
parsedVersion, err := semver.NewVersion(LegacyString)
if err != nil {
return &semver.Version{}
}
return parsedVersion
}