respect XDG_CONFIG_HOME if set

Author: theodore-s-beers

cmd/root.go

@@ -34,7 +34,7 @@ func Execute(currentVersion string) error {
 
 func init() {
 	cobra.OnInitialize(initConfig)
-	rootCmd.PersistentFlags().StringVar(&cfgFile, "config", "", "config file (default $HOME/.bootdev.yaml)")
+	rootCmd.PersistentFlags().StringVar(&cfgFile, "config", "", "config file (default $HOME/.bootdev.yaml, or in XDG_CONFIG_HOME if set)")
 }
 
 func readViperConfig(paths []string) error {
@@ -61,18 +61,35 @@ func initConfig() {
 		err := viper.ReadInConfig()
 		cobra.CheckErr(err)
 	} else {
-		// Find home directory.
+		// find home dir
 		home, err := os.UserHomeDir()
 		cobra.CheckErr(err)
 
-		// viper's built in config path thing sucks, let's do it ourselves
-		defaultPath := path.Join(home, ".bootdev.yaml")
+		// construct paths where existing config files may be located
+		// use hard-coded XDG path for backwards compatibility
+		xdgPath := path.Join(home, ".config", "bootdev", "config.yaml")
+		homeDotfilePath := path.Join(home, ".bootdev.yaml")
+
 		configPaths := []string{}
-		configPaths = append(configPaths, path.Join(home, ".config", "bootdev", "config.yaml"))
-		configPaths = append(configPaths, defaultPath)
+		configPaths = append(configPaths, xdgPath) // this one takes precedence
+		configPaths = append(configPaths, homeDotfilePath)
+
 		if err := readViperConfig(configPaths); err != nil {
-			viper.SafeWriteConfigAs(defaultPath)
-			viper.SetConfigFile(defaultPath)
+			// no existing config found; create a new one
+			// respect XDG_CONFIG_HOME if set, otherwise use dotfile in home dir
+			var newConfigPath string
+			if xdgConfigHome := os.Getenv("XDG_CONFIG_HOME"); xdgConfigHome != "" {
+				newConfigPath = path.Join(xdgConfigHome, "bootdev", "config.yaml")
+				configDir := path.Join(xdgConfigHome, "bootdev")
+				if err := os.MkdirAll(configDir, 0o755); err != nil {
+					cobra.CheckErr(err)
+				}
+			} else {
+				newConfigPath = homeDotfilePath
+			}
+
+			viper.SafeWriteConfigAs(newConfigPath)
+			viper.SetConfigFile(newConfigPath)
 			err = viper.ReadInConfig()
 			cobra.CheckErr(err)
 		}