Merge pull request #402 from mnottale/accept-trailing-slash

chris-crone · web-flow · commit 3825a376a36d · 2018-10-04T14:38:01.000+02:00
DirNameFromAppName: Accept a trailing '/'.
diff --git a/internal/names.go b/internal/names.go
@@ -36,7 +36,7 @@ func AppNameFromDir(dirName string) string {
 // DirNameFromAppName takes an application name and returns the
 // corresponding directory name
 func DirNameFromAppName(appName string) string {
-	if strings.HasSuffix(appName, AppExtension) {
+	if strings.HasSuffix(strings.TrimSuffix(appName, "/"), AppExtension) {
 		return appName
 	}
 	return appName + AppExtension

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ func AppNameFromDir(dirName string) string {`
`36`	`36`	`// DirNameFromAppName takes an application name and returns the`
`37`	`37`	`// corresponding directory name`
`38`	`38`	`func DirNameFromAppName(appName string) string {`
`39`		`- if strings.HasSuffix(appName, AppExtension) {`
	`39`	`+ if strings.HasSuffix(strings.TrimSuffix(appName, "/"), AppExtension) {`
`40`	`40`	`return appName`
`41`	`41`	`}`
`42`	`42`	`return appName + AppExtension`