From fb4267b294db57723de90667e06cfd231b849752 Mon Sep 17 00:00:00 2001
From: GabrielePuliti <12409541+Wabri@users.noreply.github.com>
Date: Thu, 13 Jun 2024 17:42:00 +0200
Subject: [PATCH] fix(internal): change configuration setup

---
 internal/config/config.go        | 36 +++++++++++++++++++++++++++++
 internal/config/config_folder.go | 39 --------------------------------
 pkg/cmd/init/init.go             | 17 +++++++-------
 3 files changed, 45 insertions(+), 47 deletions(-)
 create mode 100644 internal/config/config.go
 delete mode 100644 internal/config/config_folder.go

diff --git a/internal/config/config.go b/internal/config/config.go
new file mode 100644
index 0000000..07df96e
--- /dev/null
+++ b/internal/config/config.go
@@ -0,0 +1,36 @@
+package config
+
+import (
+	"log"
+	"os"
+	"path/filepath"
+
+	"github.com/Schrodinger-Hat/Daje/constants"
+)
+
+func InitEmptyDaje() error {
+	dajeConfigPath := filepath.Join(constants.DajeConfigBaseDir)
+	if err := os.Mkdir(dajeConfigPath, 0755); err != nil {
+		return err
+	}
+
+	dajeConfigFile := filepath.Join(constants.DajeConfigBaseDir, constants.DajeDotfileName)
+	if _, err := os.Create(dajeConfigFile); err != nil {
+		return err
+	}
+
+	return nil
+}
+
+func IsDajeInitialized() bool {
+	dotFile := filepath.Join(constants.DajeConfigBaseDir, constants.DajeDotfileName)
+	if _, err := os.Stat(dotFile); err != nil {
+		if os.IsNotExist(err) {
+			return false
+		}
+
+		log.Fatal(err)
+	}
+
+	return true
+}
diff --git a/internal/config/config_folder.go b/internal/config/config_folder.go
deleted file mode 100644
index 4e7f54a..0000000
--- a/internal/config/config_folder.go
+++ /dev/null
@@ -1,39 +0,0 @@
-package config
-
-import (
-	"log"
-	"os"
-	"os/user"
-	"path/filepath"
-
-	"github.com/Schrodinger-Hat/Daje/constants"
-)
-
-func InitEmptyDaje() error {
-	currentUser, err := user.Current()
-	if err != nil {
-		return err
-	}
-	dotFile := filepath.Join(currentUser.HomeDir, constants.DajeDotFile)
-	if err = os.Mkdir(dotFile, os.ModeDir); err != nil {
-		return err
-	}
-	return nil
-}
-
-func IsDajeInitialized() bool {
-	currentUser, err := user.Current()
-	if err != nil {
-		log.Fatal(err)
-	}
-	dotFile := filepath.Join(currentUser.HomeDir, constants.DajeDotFile)
-	if _, err := os.Stat(dotFile); err != nil {
-		if os.IsNotExist(err) {
-			return false
-		}
-
-		log.Fatal(err)
-	}
-
-	return true
-}
diff --git a/pkg/cmd/init/init.go b/pkg/cmd/init/init.go
index 519e2cd..613e0c3 100644
--- a/pkg/cmd/init/init.go
+++ b/pkg/cmd/init/init.go
@@ -21,17 +21,18 @@ func NewCmdInit() *cobra.Command {
 }
 
 func submitAction() error {
-	if config.IsDajeInitialized() {
+	if !config.IsDajeInitialized() {
+		err := config.InitEmptyDaje()
+		if err != nil {
+			fmt.Println(err)
+			return nil
+		}
+
+		fmt.Println("Daje has been initialized successfully!")
+	} else {
 		fmt.Println("Daje has been already initialized in the system.")
 		return nil
 	}
 
-	err := config.InitEmptyDaje()
-	if err != nil {
-		return nil
-	}
-
-	fmt.Println("Daje has been initialized successfully!")
-
 	return nil
 }