Merge pull request #245 from shin-/reorder-app-name-lookup

chris-crone · web-flow · commit fb2af44139bd · 2018-06-26T16:40:40.000+02:00
Lookup default permutation of app folder before literal name
diff --git a/internal/packager/extract.go b/internal/packager/extract.go
@@ -104,12 +104,13 @@ func Extract(appname string) (string, func(), error) {
 		}
 	}
 	originalAppname := appname
-	// try verbatim first
+
+	// try appending our extension
+	appname = internal.DirNameFromAppName(appname)
 	s, err := os.Stat(appname)
 	if err != nil {
-		// try appending our extension
-		appname = internal.DirNameFromAppName(appname)
-		s, err = os.Stat(appname)
+		// try verbatim
+		s, err = os.Stat(originalAppname)
 	}
 	if err != nil {
 		// look for a docker image

Original file line number	Diff line number	Diff line change
`@@ -104,12 +104,13 @@ func Extract(appname string) (string, func(), error) {`
`104`	`104`	`}`
`105`	`105`	`}`
`106`	`106`	`originalAppname := appname`
`107`		`- // try verbatim first`
	`107`	`+`
	`108`	`+ // try appending our extension`
	`109`	`+ appname = internal.DirNameFromAppName(appname)`
`108`	`110`	`s, err := os.Stat(appname)`
`109`	`111`	`if err != nil {`
`110`		`- // try appending our extension`
`111`		`- appname = internal.DirNameFromAppName(appname)`
`112`		`- s, err = os.Stat(appname)`
	`112`	`+ // try verbatim`
	`113`	`+ s, err = os.Stat(originalAppname)`
`113`	`114`	`}`
`114`	`115`	`if err != nil {`
`115`	`116`	`// look for a docker image`