Merge pull request #339 from kamaln7/issue/334

Check legacy config file paths only if applicable to the current environment
digitalocean · Aug 24, 2018 · 3b753db · 3b753db
2 parents 016b85f + 3534121
commit 3b753db
Showing 1 changed file with 15 additions and 10 deletions.
diff --git a/commands/doit.go b/commands/doit.go
@@ -129,19 +129,24 @@ func findConfig() (string, error) {
 		return cfgFile, nil
 	}
 
-	legacyConfigPath := filepath.Join(homeDir(), ".doctlcfg")
-	if _, err := os.Stat(legacyConfigPath); err == nil {
-		msg := fmt.Sprintf("Configuration detected at %q. Please move .doctlcfg to %s",
-			legacyConfigPath, configPath())
-		warn(msg)
+	if homeDir() != "" {
+		legacyConfigPath := filepath.Join(homeDir(), ".doctlcfg")
+		if _, err := os.Stat(legacyConfigPath); err == nil {
+			msg := fmt.Sprintf("Configuration detected at %q. Please move .doctlcfg to %s",
+				legacyConfigPath, configPath())
+			warn(msg)
+		}
 	}
 
-	legacyXDGPath := filepath.Join(os.Getenv("XDG_CONFIG_HOME"), "config.yaml")
-	if _, err := os.Stat(legacyXDGPath); err == nil {
-		msg := fmt.Sprintf("Configuration detected at %q. Please move config.yaml to %s",
-			legacyXDGPath, configPath())
-		warn(msg)
+	if os.Getenv("XDG_CONFIG_HOME") != "" {
+		legacyXDGPath := filepath.Join(os.Getenv("XDG_CONFIG_HOME"), "config.yaml")
+		if _, err := os.Stat(legacyXDGPath); err == nil {
+			msg := fmt.Sprintf("Configuration detected at %q. Please move config.yaml to %s",
+				legacyXDGPath, configPath())
+			warn(msg)
+		}
 	}
+
 	ch := configHome()
 	if err := os.MkdirAll(ch, 0755); err != nil {
 		return "", err