diff --git a/core.go b/core.go index 4138bafa0..c0c4c364a 100644 --- a/core.go +++ b/core.go @@ -12,9 +12,7 @@ package core //go:generate go run $GOPATH/src/v2ray.com/core/common/errors/errorgen/main.go -pkg core -path Core import ( - "fmt" - - "v2ray.com/core/common/platform" + "v2ray.com/core/common/serial" ) var ( @@ -30,10 +28,12 @@ func Version() string { return version } -// PrintVersion prints current version into console. -func PrintVersion() { - fmt.Printf("V2Ray %s (%s) %s%s", Version(), codename, build, platform.LineSeparator()) - fmt.Printf("%s%s", intro, platform.LineSeparator()) +// VersionStatement returns a list of strings representing the full version info. +func VersionStatement() []string { + return []string{ + serial.Concat("V2Ray ", Version(), "(", codename, ")", build), + intro, + } } /* diff --git a/main/main.go b/main/main.go index 82ebe9f6a..e3b323da9 100644 --- a/main/main.go +++ b/main/main.go @@ -85,10 +85,17 @@ func startV2Ray() (core.Server, error) { return server, nil } +func printVersion() { + version := core.VersionStatement() + for _, s := range version { + fmt.Println(s) + } +} + func main() { flag.Parse() - core.PrintVersion() + printVersion() if *version { return