Merge pull request #297 from bilibili/kratos/fix-gopath

fix gopath
pull/307/head
Tony 5 years ago committed by GitHub
commit 918eed4df6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 5
      tool/kratos-protoc/protoc.go
  2. 5
      tool/kratos/tool.go

@ -145,7 +145,7 @@ func latestKratos() (string, error) {
func gopath() (gp string) {
gopaths := strings.Split(os.Getenv("GOPATH"), ":")
if len(gopaths) == 1 {
if len(gopaths) == 1 && gopaths[0] != "" {
return gopaths[0]
}
pwd, err := os.Getwd()
@ -157,6 +157,9 @@ func gopath() (gp string) {
return
}
for _, gopath := range gopaths {
if gopath == "" {
continue
}
absgp, err := filepath.Abs(gopath)
if err != nil {
return

@ -187,7 +187,7 @@ func (t Tool) installed() bool {
func gopath() (gp string) {
gopaths := strings.Split(os.Getenv("GOPATH"), ":")
if len(gopaths) == 1 {
if len(gopaths) == 1 && gopaths[0] != "" {
return gopaths[0]
}
pwd, err := os.Getwd()
@ -199,6 +199,9 @@ func gopath() (gp string) {
return
}
for _, gopath := range gopaths {
if gopath == "" {
continue
}
absgp, err := filepath.Abs(gopath)
if err != nil {
return

Loading…
Cancel
Save