fix loading of the default configuration file

orgrim · Dec 23, 2021 · ec92e82 · ec92e82
1 parent 9a26348
commit ec92e82
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/config.go b/config.go
@@ -486,6 +486,12 @@ func loadConfigurationFile(path string) (options, error) {
 
 	cfg, err := ini.Load(path)
 	if err != nil {
+		if path == defaultCfgFile && errors.Is(err, os.ErrNotExist) {
+			// Fallback on defaults when the default configuration does not exist
+			l.Verbosef("default configuration file %s does not exist, skipping\n", defaultCfgFile)
+			return opts, nil
+		}
+
 		return opts, fmt.Errorf("Could load configuration file: %v", err)
 	}
 

diff --git a/main.go b/main.go
@@ -150,7 +150,7 @@ func run() (retVal error) {
 	// Load configuration file and allow the default configuration
 	// file to be absent
 	configOpts, err := loadConfigurationFile(cliOpts.CfgFile)
-	if err != nil && cliOpts.CfgFile != defaultCfgFile {
+	if err != nil {
 		return err
 	}