lbsadmin
/
bee
mirror of https://github.com/beego/bee.git
1
0
Fork 0
Code Issues Releases Activity

Merge pull request #367 from gloomyzerg/master 

fix #332 swagger generate bug on windows
This commit is contained in:
Sergey Lanzman 2017-03-12 17:24:20 +02:00 committed by GitHub
parent 932f16ba4e 39cc0bc04e
commit b3ea5dda0e
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bee.go
View File

@ -160,7 +160,7 @@ func main() {
// Check if current directory is inside the GOPATH,
// if so parse the packages inside it.
if strings.Contains(currentpath, GetGOPATHs()[0]+"/src") && isGenerateDocs(cmd.Name(), args) {
if IsInGOPATH(currentpath) && isGenerateDocs(cmd.Name(), args) {
parsePackagesFromDir(currentpath)
}

8
util.go
View File

@ -68,6 +68,14 @@ func GetGOPATHs() []string {
return paths
}
// IsInGOPATH checks the path is in the fisrt GOPATH(/src) or not
func IsInGOPATH(thePath string) bool {
if runtime.GOOS == "windows" {
thePath = filepath.ToSlash(thePath)
}
return strings.Contains(thePath, GetGOPATHs()[0]+"/src")
}
// IsBeegoProject checks whether the current path is a Beego application or not
func IsBeegoProject(thePath string) bool {
mainFiles := []string{}