Merge pull request #362 from mspromyhaha/master

improve get gopaths
5 years ago · 3ff6f39a56
parent 230a63771d 0fc38dd40f
commit 3ff6f39a56
2 changed files with 2 additions and 16 deletions
--- a/tool/kratos-protoc/protoc.go
+++ b/tool/kratos-protoc/protoc.go
@ -144,14 +144,7 @@ func latestKratos() (string, error) {
 }

 func gopath() (gp string) {
-	var gopaths []string
-
-	switch runtime.GOOS {
-	case "windows":
-		gopaths = strings.Split(os.Getenv("GOPATH"), ";")
-	default:
-		gopaths = strings.Split(os.Getenv("GOPATH"), ":")
-	}
+	gopaths := strings.Split(os.Getenv("GOPATH"), string(filepath.ListSeparator))

 	if len(gopaths) == 1 && gopaths[0] != "" {
 		return gopaths[0]
--- a/tool/kratos/tool.go
+++ b/tool/kratos/tool.go
@ -186,14 +186,7 @@ func (t Tool) installed() bool {
 }

 func gopath() (gp string) {
-	var gopaths []string
-
-	switch runtime.GOOS {
-	case "windows":
-		gopaths = strings.Split(os.Getenv("GOPATH"), ";")
-	default:
-		gopaths = strings.Split(os.Getenv("GOPATH"), ":")
-	}
+	gopaths := strings.Split(os.Getenv("GOPATH"), string(filepath.ListSeparator))

 	if len(gopaths) == 1 && gopaths[0] != "" {
 		return gopaths[0]