lbsadmin/bee
1
0
Fork 0
mirror of https://github.com/beego/bee.git synced 2024-11-22 05:00:54 +00:00
Code Issues Releases Activity

Merge pull request #416 from beego/develop

Browse Source 
fix #379
This commit is contained in:
astaxie 2017-04-20 09:42:34 +08:00 committed by GitHub
commit 94553cdca7
1 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
utils/utils.go
View File

@ -52,14 +52,7 @@ func IsExist(path string) bool {
// GetGOPATHs returns all paths in GOPATH variable. // GetGOPATHs returns all paths in GOPATH variable.
func GetGOPATHs() []string { func GetGOPATHs() []string {
gopath := os.Getenv("GOPATH") gopath := os.Getenv("GOPATH")
var paths []string return filepath.SplitList(gopath)
if runtime.GOOS == "windows" {
gopath = strings.Replace(gopath, "\\", "/", -1)
paths = strings.Split(gopath, ";")
} else {
paths = strings.Split(gopath, ":")
}
return paths
} }
// IsInGOPATH checks whether the path is inside of any GOPATH or not // IsInGOPATH checks whether the path is inside of any GOPATH or not
@ -315,10 +308,10 @@ func CheckEnv(appname string) (apppath, packpath string, err error) {
beeLogger.Log.Fatal("GOPATH environment variable is not set or empty") beeLogger.Log.Fatal("GOPATH environment variable is not set or empty")
} }
currpath, _ := os.Getwd() currpath, _ := os.Getwd()
currpath = path.Join(currpath, appname) currpath = filepath.Join(currpath, appname)
for _, gpath := range gps { for _, gpath := range gps {
gsrcpath := path.Join(gpath, "src") gsrcpath := filepath.Join(gpath, "src")
if strings.HasPrefix(currpath, gsrcpath) { if strings.HasPrefix(strings.ToLower(currpath), strings.ToLower(gsrcpath)) {
packpath = strings.Replace(currpath[len(gsrcpath)+1:], string(filepath.Separator), "/", -1) packpath = strings.Replace(currpath[len(gsrcpath)+1:], string(filepath.Separator), "/", -1)
return currpath, packpath, nil return currpath, packpath, nil
} }
@ -331,8 +324,8 @@ func CheckEnv(appname string) (apppath, packpath string, err error) {
beeLogger.Log.Warn("You current workdir is not inside $GOPATH/src.") beeLogger.Log.Warn("You current workdir is not inside $GOPATH/src.")
beeLogger.Log.Debugf("GOPATH: %s", FILE(), LINE(), gopath) beeLogger.Log.Debugf("GOPATH: %s", FILE(), LINE(), gopath)
gosrcpath := path.Join(gopath, "src") gosrcpath := filepath.Join(gopath, "src")
apppath = path.Join(gosrcpath, appname) apppath = filepath.Join(gosrcpath, appname)
if _, e := os.Stat(apppath); !os.IsNotExist(e) { if _, e := os.Stat(apppath); !os.IsNotExist(e) {
err = fmt.Errorf("Cannot create application without removing '%s' first", apppath) err = fmt.Errorf("Cannot create application without removing '%s' first", apppath)