mirror of
https://github.com/beego/bee.git
synced 2024-11-21 13:40:53 +00:00
use go env
check project is go mod
or not.
This commit is contained in:
parent
8893ad2d13
commit
91e4ac31a4
@ -435,7 +435,7 @@ func analyseControllerPkg(vendorPath, localName, pkgpath string) {
|
||||
|
||||
pkgRealpath := ""
|
||||
|
||||
if os.Getenv(`GO111MODULE`) == `on` {
|
||||
if bu.IsGOMODULE() {
|
||||
pkgRealpath = filepath.Join(bu.GetBeeWorkPath(), "..", pkgpath)
|
||||
} else {
|
||||
gopaths := bu.GetGOPATHs()
|
||||
|
@ -452,3 +452,14 @@ func GetGoVersionSkipMinor() string {
|
||||
strArray := strings.Split(runtime.Version()[2:], `.`)
|
||||
return strArray[0] + `.` + strArray[1]
|
||||
}
|
||||
|
||||
func IsGOMODULE() bool {
|
||||
if combinedOutput, e := exec.Command(`go`, `env`).CombinedOutput(); e != nil {
|
||||
beeLogger.Log.Errorf("i cann't find go.")
|
||||
} else {
|
||||
regex := regexp.MustCompile(`GOMOD="?(.+go.mod)"?`)
|
||||
stringSubmatch := regex.FindStringSubmatch(string(combinedOutput))
|
||||
return len(stringSubmatch) == 2
|
||||
}
|
||||
return false
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user