Fix filepath (#990)
This commit is contained in:
@@ -2,6 +2,7 @@ package ctx
|
||||
|
||||
import (
|
||||
"errors"
|
||||
"github.com/tal-tech/go-zero/tools/goctl/util"
|
||||
"os"
|
||||
"path/filepath"
|
||||
|
||||
@@ -30,6 +31,11 @@ func projectFromGoMod(workDir string) (*ProjectContext, error) {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
workDir, err := util.ReadLink(workDir)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
data, err := execx.Run("go list -json -m", workDir)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
@@ -43,7 +49,12 @@ func projectFromGoMod(workDir string) (*ProjectContext, error) {
|
||||
var ret ProjectContext
|
||||
ret.WorkDir = workDir
|
||||
ret.Name = filepath.Base(m.Dir)
|
||||
ret.Dir = m.Dir
|
||||
dir, err := util.ReadLink(m.Dir)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
ret.Dir = dir
|
||||
ret.Path = m.Path
|
||||
return &ret, nil
|
||||
}
|
||||
|
||||
@@ -21,8 +21,18 @@ func projectFromGoPath(workDir string) (*ProjectContext, error) {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
workDir, err := util.ReadLink(workDir)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
buildContext := build.Default
|
||||
goPath := buildContext.GOPATH
|
||||
goPath, err = util.ReadLink(goPath)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
goSrc := filepath.Join(goPath, "src")
|
||||
if !util.FileExists(goSrc) {
|
||||
return nil, errModuleCheck
|
||||
|
||||
Reference in New Issue
Block a user