From 8d125a5a8a1310f971033e115d8c9dfce6787bfe Mon Sep 17 00:00:00 2001
From: DeveloperDurp <DeveloperDurp@durp.info>
Date: Fri, 5 Apr 2024 07:26:34 -0500
Subject: [PATCH] Fix config file being generated in working dir

---
 .DurpCLI.yaml => .DurpCLI.yaml.bak |  0
 cmd/root.go                        | 47 +++++++++++++++++-------------
 2 files changed, 26 insertions(+), 21 deletions(-)
 rename .DurpCLI.yaml => .DurpCLI.yaml.bak (100%)

diff --git a/.DurpCLI.yaml b/.DurpCLI.yaml.bak
similarity index 100%
rename from .DurpCLI.yaml
rename to .DurpCLI.yaml.bak
diff --git a/cmd/root.go b/cmd/root.go
index d2a03f9..8ebca0b 100644
--- a/cmd/root.go
+++ b/cmd/root.go
@@ -3,9 +3,11 @@ package cmd
 import (
 	"fmt"
 	"os"
+	"os/user"
 
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
+
 	"gitlab.com/DeveloperDurp/DurpCLI/cmd/auth"
 	"gitlab.com/DeveloperDurp/DurpCLI/cmd/cfg"
 	"gitlab.com/DeveloperDurp/DurpCLI/cmd/net"
@@ -35,36 +37,39 @@ func setDefaults() {
 }
 
 func init() {
-	cobra.OnInitialize(initConfig)
-
+	//if cfgFile != "" {
+	//	viper.SetConfigFile(cfgFile)
+	//} else {
+	//	cobra.CheckErr(err)
+	//}
 	setDefaults()
-
-	err := viper.WriteConfigAs(".DurpCLI.yaml")
-	if err != nil {
-		fmt.Println(err)
-	}
+	initConfig()
+	loadConfig()
 
 	rootCmd.AddCommand(net.NetCmd)
 	rootCmd.AddCommand(auth.AuthCmd)
 	rootCmd.AddCommand(cfg.Cfgcmd)
-	rootCmd.PersistentFlags().StringVar(&cfgFile, "config", "", "config file (default is $HOME/.DurpCLI.yaml)")
+	rootCmd.PersistentFlags().
+		StringVar(&cfgFile, "config", "", "config file (default is $HOME/.DurpCLI.yaml)")
 
 	rootCmd.Flags().BoolP("toggle", "t", false, "Help message for toggle")
 }
 
 func initConfig() {
-	if cfgFile != "" {
-		viper.SetConfigFile(cfgFile)
-	} else {
-		home, err := os.UserHomeDir()
-		cobra.CheckErr(err)
-
-		viper.AddConfigPath(home)
-		viper.SetConfigType("yaml")
-		viper.SetConfigName(".DurpCLI")
+	usr, err := user.Current()
+	if err != nil {
+		os.Exit(1)
+	}
+	viper.SetConfigType("yaml")
+	viper.SetConfigName(".durpcli")
+	viper.AddConfigPath(usr.HomeDir)
+}
+
+func loadConfig() {
+	viper.AutomaticEnv()
+	err := viper.ReadInConfig()
+	if err != nil {
+		fmt.Println("Config file not found. Creating a new one with defaults...")
+		viper.SafeWriteConfig()
 	}
-
-	viper.AutomaticEnv()
-	viper.ReadInConfig()
-
 }