Merge pull request #289 from superfly:codepope/issue288

Regression on fix for dot in app pathnames.
superfly · Sep 7, 2020 · 0eaff6f · 0eaff6f
2 parents d523113 + e6a1a7c
commit 0eaff6f
Showing 1 changed file with 11 additions and 2 deletions.
diff --git a/flyctl/app_config.go b/flyctl/app_config.go
@@ -252,8 +252,17 @@ func ResolveConfigFileFromPath(p string) (string, error) {
 		return "", err
 	}
 
-	// path is a file, return
-	if filepath.Ext(p) != "" {
+	// Is this a bare directory path? Stat the path
+	pd, err := os.Stat(p)
+
+	if err == os.ErrNotExist {
+		return path.Join(p, defaultConfigFileName), nil
+	} else if err != nil {
+		return "", err
+	}
+
+	// Ok, something exists. Is it a file - yes? return the path
+	if !pd.IsDir() {
 		return p, nil
 	}