Archives/loop
2
0
Fork 0
mirror of https://github.com/lightninglabs/loop synced 2024-11-09 19:10:47 +00:00
Code Issues Releases Wiki Activity

Merge pull request #803 from starius/loop-cli-path-opts-fix

Browse Source 
cmd/loop: fix path options and loopDir interaction
This commit is contained in:
Boris Nagaev 2024-08-05 10:44:19 -03:00 committed by GitHub
commit 8c97c60bb4
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 25 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
cmd/loop/main.go
View File

@ -193,25 +193,33 @@ func extractPathArgs(ctx *cli.Context) (string, string, error) {
// properly read the macaroons and also the cert. This will either be
// the default, or will have been overwritten by the end user.
loopDir := lncfg.CleanAndExpandPath(ctx.GlobalString(loopDirFlag.Name))
tlsCertPath := lncfg.CleanAndExpandPath(ctx.GlobalString(
tlsCertFlag.Name,
))
macPath := lncfg.CleanAndExpandPath(ctx.GlobalString(
macaroonPathFlag.Name,
))
// If a custom loop directory was set, we'll also check if custom paths
// for the TLS cert and macaroon file were set as well. If not, we'll
// override their paths so they can be found within the custom loop
// directory set. This allows us to set a custom loop directory, along
// with custom paths to the TLS cert and macaroon file.
tlsCertPathRaw := ctx.GlobalString(tlsCertFlag.Name)
tlsCertPath := lncfg.CleanAndExpandPath(tlsCertPathRaw)
macPathRaw := ctx.GlobalString(macaroonPathFlag.Name)
macPath := lncfg.CleanAndExpandPath(macPathRaw)
// If a custom loop directory or network was set, we'll also check if
// custom paths for the TLS cert and macaroon file were set as well. If
// not, we'll override their paths so they can be found within the
// custom loop directory set. This allows us to set a custom loop
// directory and/or network, along with custom paths to the TLS cert and
// macaroon file.
if loopDir != loopd.LoopDirBase || networkStr != loopd.DefaultNetwork {
tlsCertPath = filepath.Join(
loopDir, networkStr, loopd.DefaultTLSCertFilename,
)
macPath = filepath.Join(
loopDir, networkStr, loopd.DefaultMacaroonFilename,
)
if tlsCertPathRaw == loopd.DefaultTLSCertPath {
tlsCertPath = filepath.Join(
loopDir, networkStr,
loopd.DefaultTLSCertFilename,
)
}
if macPathRaw == loopd.DefaultMacaroonPath {
macPath = filepath.Join(
loopDir, networkStr,
loopd.DefaultMacaroonFilename,
)
}
}
return tlsCertPath, macPath, nil