From ccc29509df09fb35f9f822b9539fedff30c1e1c1 Mon Sep 17 00:00:00 2001 From: bonfy Date: Fri, 12 Jul 2019 09:55:40 +0800 Subject: [PATCH] change findCmdSuffix to findCmdPath --- cobra/cmd/project.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/cobra/cmd/project.go b/cobra/cmd/project.go index 9fab85f6..688ec7d9 100644 --- a/cobra/cmd/project.go +++ b/cobra/cmd/project.go @@ -93,8 +93,7 @@ func NewProjectFromPath(absPath string) *Project { p := new(Project) - cmdDir := findCmdDir(absPath) - p.absPath = strings.TrimSuffix(absPath, findCmdSuffix(cmdDir)) + p.absPath = findCmdSuffix(absPath) p.name = filepath.ToSlash(trimSrcPath(p.absPath, p.SrcPath())) return p } @@ -133,11 +132,12 @@ func (p *Project) CmdPath() string { } // findCmdSuffix returns the cmd dir start with file path separator. -func findCmdSuffix(cmdDir string) string { +func findCmdSuffix(path string) string { + cmdDir := findCmdDir(path) if filepathHasPrefix(cmdDir, string(os.PathSeparator)) { - return cmdDir + return strings.TrimSuffix(path, cmdDir) } - return string(os.PathSeparator) + cmdDir + return return strings.TrimSuffix(path, string(os.PathSeparator) + cmdDir) } // findCmdDir checks if base of absPath is cmd dir and returns it or