Merge pull request #598 from ellemouton/fixMacPathConstruction

guggero · web-flow · commit 6a59496a9308 · 2023-07-18T12:30:06.000+02:00
config: fix macaroon path construction
diff --git a/config.go b/config.go
@@ -440,12 +440,10 @@ func loadAndValidateConfig(interceptor signal.Interceptor) (*Config, error) {
 		}
 	}
 
-	if cfg.Network != DefaultNetwork {
-		if cfg.MacaroonPath == DefaultMacaroonPath {
-			cfg.MacaroonPath = filepath.Join(
-				litDir, cfg.Network, DefaultMacaroonFilename,
-			)
-		}
+	if cfg.MacaroonPath == DefaultMacaroonPath {
+		cfg.MacaroonPath = filepath.Join(
+			litDir, cfg.Network, DefaultMacaroonFilename,
+		)
 	}
 
 	// Initiate our listeners. For now, we only support listening on one

Original file line number	Diff line number	Diff line change
`@@ -440,12 +440,10 @@ func loadAndValidateConfig(interceptor signal.Interceptor) (*Config, error) {`
`440`	`440`	`}`
`441`	`441`	`}`
`442`	`442`
`443`		`- if cfg.Network != DefaultNetwork {`
`444`		`- if cfg.MacaroonPath == DefaultMacaroonPath {`
`445`		`- cfg.MacaroonPath = filepath.Join(`
`446`		`- litDir, cfg.Network, DefaultMacaroonFilename,`
`447`		`- )`
`448`		`- }`
	`443`	`+ if cfg.MacaroonPath == DefaultMacaroonPath {`
	`444`	`+ cfg.MacaroonPath = filepath.Join(`
	`445`	`+ litDir, cfg.Network, DefaultMacaroonFilename,`
	`446`	`+ )`
`449`	`447`	`}`
`450`	`448`
`451`	`449`	`// Initiate our listeners. For now, we only support listening on one`