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

fix

Browse source
This commit is contained in:
bonfy 2019-07-12 10:02:57 +08:00
parent ccc29509df
commit bacf94f3d5
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
cobra/cmd/project.go
View file

@ -93,7 +93,7 @@ func NewProjectFromPath(absPath string) *Project {
p := new(Project) p := new(Project)
p.absPath = findCmdSuffix(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
} }
@ -131,13 +131,13 @@ func (p *Project) CmdPath() string {
return p.cmdPath return p.cmdPath
} }
// findCmdSuffix returns the cmd dir start with file path separator. // findCmdPath returns the cmd path.
func findCmdSuffix(path string) string { func findCmdPath(path string) string {
cmdDir := findCmdDir(path) cmdDir := findCmdDir(path)
if filepathHasPrefix(cmdDir, string(os.PathSeparator)) { if filepathHasPrefix(cmdDir, string(os.PathSeparator)) {
return strings.TrimSuffix(path, cmdDir) return strings.TrimSuffix(path, cmdDir)
} }
return return strings.TrimSuffix(path, string(os.PathSeparator) + 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