fix: read configuration file iif set

ctfer-io · Jun 1, 2024 · 6d7df76 · 6d7df76
1 parent 6f7cbb1
commit 6d7df76
Showing 1 changed file with 15 additions and 13 deletions.
diff --git a/cmd/ctfd-setup/main.go b/cmd/ctfd-setup/main.go
@@ -573,19 +573,21 @@ func run(ctx *cli.Context) error {
 	}
 
 	// Read and unmarshal setup config file if any
-	f := ctx.String("file")
-	log.Info("getting configuration file", zap.String("file", f))
-	if _, err := os.Stat(f); err == nil {
-		log.Info("configuration file found", zap.String("file", f))
-		fd, err := os.Open(f)
-		if err != nil {
-			return errors.Wrapf(err, "opening file %s", f)
-		}
-		defer fd.Close()
-		dec := yaml.NewDecoder(fd)
-		dec.KnownFields(true)
-		if err := dec.Decode(&conf); err != nil {
-			return errors.Wrap(err, "unmarshalling configuration")
+	if ctx.IsSet("file") {
+		f := ctx.String("file")
+		log.Info("getting configuration file", zap.String("file", f))
+		if _, err := os.Stat(f); err == nil {
+			fd, err := os.Open(f)
+			if err != nil {
+				return errors.Wrapf(err, "opening file %s", f)
+			}
+			defer fd.Close()
+
+			dec := yaml.NewDecoder(fd)
+			dec.KnownFields(true)
+			if err := dec.Decode(&conf); err != nil {
+				return errors.Wrap(err, "unmarshalling configuration")
+			}
 		}
 	}