Default to ~/.config/gmailctl for the config dir.

This is a minimal fix for mbrt#144
lgarron · Mar 21, 2024 · 8a2dcc8 · 8a2dcc8
1 parent 086c6a2
commit 8a2dcc8
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/cmd/gmailctl/cmd/init_cmd.go b/cmd/gmailctl/cmd/init_cmd.go
@@ -87,6 +87,8 @@ func handleCfgDir() error {
 		}
 	}
 
+	fmt.Printf("%s", cfgDir)
+
 	// Create default config files
 	cfgFile := path.Join(cfgDir, "config.jsonnet")
 	if err := createDefault(cfgFile, data.DefaultConfig()); err != nil {

diff --git a/cmd/gmailctl/cmd/root_cmd.go b/cmd/gmailctl/cmd/root_cmd.go
@@ -51,7 +51,7 @@ func init() {
 	// Here you will define your flags and configuration settings.
 	// Cobra supports persistent flags, which, if defined here,
 	// will be global for your application.
-	rootCmd.PersistentFlags().StringVar(&cfgDir, "config", "", "config directory (default is $HOME/.gmailctl)")
+	rootCmd.PersistentFlags().StringVar(&cfgDir, "config", "", "config directory (default is $HOME/.gmailctl if already present, else $HOME/.config/gmailctl)")
 }
 
 // initConfig reads in config file and ENV variables if set.
@@ -65,6 +65,10 @@ func initConfig() {
 			fmt.Println(err)
 			os.Exit(1)
 		}
-		cfgDir = path.Join(usr.HomeDir, ".gmailctl")
+		if _, err := os.Stat(path.Join(usr.HomeDir, ".gmailctl")); err != nil && os.IsNotExist(err) {
+			cfgDir = path.Join(usr.HomeDir, ".config", "gmailctl")
+		} else {
+			cfgDir = path.Join(usr.HomeDir, ".gmailctl")
+		}
 	}
 }