lzhr
/
v2fly
mirror of https://github.com/v2fly/v2ray-core.git
1
0
Fork 0
Code Issues Releases Wiki Activity

move Println to main

This commit is contained in:
Darien Raymond 2018-02-16 14:03:55 +01:00
parent e9e6b21252
commit 242e65e424
No known key found for this signature in database
GPG Key ID: 7251FFA14BB18169
2 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
core.go
View File

@ -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,
}
}
/*

9
main/main.go
View File

@ -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