From b455d865406551391bc2df25d8104742ae8f5d91 Mon Sep 17 00:00:00 2001
From: Dj Walker-Morgan <codepope@gmail.com>
Date: Thu, 17 Sep 2020 17:39:24 +0100
Subject: [PATCH] Redid order of file exists check for sanity

---
 flyctl/app_config.go | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/flyctl/app_config.go b/flyctl/app_config.go
index 95ab173a3c..7f7d5b2639 100644
--- a/flyctl/app_config.go
+++ b/flyctl/app_config.go
@@ -258,18 +258,19 @@ func ResolveConfigFileFromPath(p string) (string, error) {
 	// 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 {
+	if err != nil {
+		if os.IsNotExist(err) {
+			return p, nil
+		}
 		return "", err
 	}
 
 	// Ok, something exists. Is it a file - yes? return the path
-	if !pd.IsDir() {
-		return p, nil
+	if pd.IsDir() {
+		return path.Join(p, defaultConfigFileName), nil
 	}
 
-	return path.Join(p, defaultConfigFileName), nil
+	return p, nil
 }
 
 func ConfigFormatFromPath(p string) ConfigFormat {