test/gf
1
0
Fork 0
mirror of https://gitee.com/johng/gf.git synced 2024-12-02 12:17:53 +08:00
Code Issues Actions 18 Packages Projects Releases Wiki Activity

improve gfile.MainPkgPath

Browse Source
This commit is contained in:
jianchenma 2021-03-19 16:35:55 +08:00
parent 2f3df76f37
commit 4aaf09fded
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
os/gfile/gfile_source.go
View File

@ -64,7 +64,7 @@ func MainPkgPath() string {
continue continue
} }
} }
if gregex.IsMatchString(`package\s+main`, GetContents(file)) { if gregex.IsMatchString(`package\s+main\s+{`, GetContents(file)) {
mainPkgPath.Set(Dir(file)) mainPkgPath.Set(Dir(file))
return Dir(file) return Dir(file)
} }
@ -79,7 +79,7 @@ func MainPkgPath() string {
for path = Dir(lastFile); len(path) > 1 && Exists(path) && path[len(path)-1] != os.PathSeparator; { for path = Dir(lastFile); len(path) > 1 && Exists(path) && path[len(path)-1] != os.PathSeparator; {
files, _ := ScanDir(path, "*.go") files, _ := ScanDir(path, "*.go")
for _, v := range files { for _, v := range files {
if gregex.IsMatchString(`package\s+main`, GetContents(v)) { if gregex.IsMatchString(`package\s+main\s+{`, GetContents(v)) {
mainPkgPath.Set(path) mainPkgPath.Set(path)
return path return path
} }