From 6afbafa2504d1c634b8bbff57f4dbd82335d9238 Mon Sep 17 00:00:00 2001 From: astaxie Date: Mon, 24 Apr 2017 20:51:56 +0800 Subject: [PATCH] Check Gopath in one place --- cmd/commands/version/version.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cmd/commands/version/version.go b/cmd/commands/version/version.go index 596bcf5..0a9197d 100644 --- a/cmd/commands/version/version.go +++ b/cmd/commands/version/version.go @@ -17,6 +17,7 @@ import ( "github.com/beego/bee/cmd/commands" beeLogger "github.com/beego/bee/logger" "github.com/beego/bee/logger/colors" + "github.com/beego/bee/utils" "gopkg.in/yaml.v2" ) @@ -117,16 +118,15 @@ func ShowShortVersionBanner() { } func GetBeegoVersion() string { - gopath := os.Getenv("GOPATH") re, err := regexp.Compile(`VERSION = "([0-9.]+)"`) if err != nil { return "" } - if gopath == "" { + wgopath := utils.GetGOPATHs() + if len(wgopath) == 0 { beeLogger.Log.Error("You need to set GOPATH environment variable") return "" } - wgopath := path.SplitList(gopath) for _, wg := range wgopath { wg, _ = path.EvalSymlinks(path.Join(wg, "src", "github.com", "astaxie", "beego")) filename := path.Join(wg, "beego.go")