internal/util/projutil/project_util.go: fix repo lookup when CWD is $GOPATH (#1432)

joelanford · web-flow · commit fb10d7d75c43 · 2019-05-16T12:23:28.000-04:00
diff --git a/internal/util/projutil/project_util.go b/internal/util/projutil/project_util.go
@@ -142,7 +142,7 @@ func CheckAndGetProjectGoPkg() string {
 	gopath := MustSetGopath(MustGetGopath())
 	goSrc := filepath.Join(gopath, SrcDir)
 	wd := MustGetwd()
-	currPkg := strings.Replace(wd, goSrc+fsep, "", 1)
+	currPkg := strings.Replace(wd, goSrc, "", 1)
 	// strip any "/" prefix from the repo path.
 	return strings.TrimPrefix(currPkg, fsep)
 }

Original file line number	Diff line number	Diff line change
`@@ -142,7 +142,7 @@ func CheckAndGetProjectGoPkg() string {`
`142`	`142`	`gopath := MustSetGopath(MustGetGopath())`
`143`	`143`	`goSrc := filepath.Join(gopath, SrcDir)`
`144`	`144`	`wd := MustGetwd()`
`145`		`- currPkg := strings.Replace(wd, goSrc+fsep, "", 1)`
	`145`	`+ currPkg := strings.Replace(wd, goSrc, "", 1)`
`146`	`146`	`// strip any "/" prefix from the repo path.`
`147`	`147`	`return strings.TrimPrefix(currPkg, fsep)`
`148`	`148`	`}`