glenux-archive/spf13--cobra
1
0
Fork 0
mirror of https://github.com/spf13/cobra synced 2025-05-07 05:47:26 +00:00
Code Issues Projects Releases Packages Wiki Activity

add os.PathSeparator to the return value of findCmdDir func

Browse source 
add func findCmdSuffix

fix comment

change findCmdSuffix to findCmdPath

fix
This commit is contained in:
bonfy 2018-04-12 16:05:36 +08:00
parent cd30c2a7e9
commit 70ca0b2f14
1 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
cobra/cmd/project.go
View file

@ -92,7 +92,8 @@ func NewProjectFromPath(absPath string) *Project {
} }
p := new(Project) p := new(Project)
p.absPath = strings.TrimSuffix(absPath, findCmdDir(absPath))
p.absPath = findCmdPath(absPath)
p.name = filepath.ToSlash(trimSrcPath(p.absPath, p.SrcPath())) p.name = filepath.ToSlash(trimSrcPath(p.absPath, p.SrcPath()))
return p return p
} }
@ -130,6 +131,15 @@ func (p *Project) CmdPath() string {
return p.cmdPath return p.cmdPath
} }
// findCmdPath returns the cmd path.
func findCmdPath(path string) string {
cmdDir := findCmdDir(path)
if filepathHasPrefix(cmdDir, string(os.PathSeparator)) {
return strings.TrimSuffix(path, cmdDir)
}
return strings.TrimSuffix(path, string(os.PathSeparator)+cmdDir)
}
// findCmdDir checks if base of absPath is cmd dir and returns it or // findCmdDir checks if base of absPath is cmd dir and returns it or
// looks for existing cmd dir in absPath. // looks for existing cmd dir in absPath.
func findCmdDir(absPath string) string { func findCmdDir(absPath string) string {