Load root dir before loading config

sourcenetwork · Jan 29, 2024 · 69846b4 · 69846b4
1 parent 6f53af2
commit 69846b4
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/cli/utils.go b/cli/utils.go
@@ -99,6 +99,9 @@ func setStoreContext(cmd *cobra.Command, cfg *config.Config) error {
 // loadConfig loads the rootDir containing the configuration file,
 // otherwise warn about it and load a default configuration.
 func loadConfig(cfg *config.Config) error {
+	if err := cfg.LoadRootDirFromFlagOrDefault(); err != nil {
+		return err
+	}
 	return cfg.LoadWithRootdir(cfg.ConfigFileExists())
 }
 

diff --git a/config/config.go b/config/config.go
@@ -130,10 +130,6 @@ func (cfg *Config) LoadWithRootdir(withRootdir bool) error {
 		return err
 	}
 
-	if err := cfg.LoadRootDirFromFlagOrDefault(); err != nil {
-		return err
-	}
-
 	if withRootdir {
 		if err := cfg.v.ReadInConfig(); err != nil {
 			return NewErrReadingConfigFile(err)