Merge branch 'staging' into generic-sp-info

0chain · Oct 17, 2022 · e26c4e6 · e26c4e6
2 parents a7b9c3d + 8d1267f
commit e26c4e6
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 6 deletions.
diff --git a/cmd/root.go b/cmd/root.go
@@ -65,12 +65,7 @@ func Execute() {
 
 func initConfig() {
 
-	var configDir string
-	if cDir != "" {
-		configDir = cDir
-	} else {
-		configDir = util.GetConfigDir()
-	}
+	configDir := util.SetConfigDir(cDir)
 
 	if cfgFile == "" {
 		cfgFile = "config.yaml"

diff --git a/util/homedir.go b/util/homedir.go
@@ -5,9 +5,25 @@ import (
 	"os"
 )
 
+var configDir string
+
+func SetConfigDir(dir string) string {
+	if dir != "" {
+		configDir = dir
+		return dir
+	}
+	return getConfigDirDefault()
+}
+
 // GetConfigDir get config directory , default is ~/.zcn/
 func GetConfigDir() string {
+	if configDir != "" {
+		return configDir
+	}
+	return getConfigDirDefault()
+}
 
+func getConfigDirDefault() string {
 	configDir := GetHomeDir() + string(os.PathSeparator) + ".zcn"
 
 	if err := os.MkdirAll(configDir, 0744); err != nil {