davide/palladum-lightning
1
0
Fork 0
Code Issues Pull Requests Actions 5 Packages Projects Releases Wiki Activity

lightning-cli: fix the access to man pages

Browse Source 
Changelog-Fixed: lightning-cli: access to man pages from the installed directory.

Signed-off-by: Lagrang3 <lagrang3@protonmail.com>
This commit is contained in:
Lagrang3
2025-02-11 11:54:02 +01:00
committed by Rusty Russell
parent 37150c1f49
commit dfd9e815ba
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
cli/lightning-cli.c
View File

@@ -294,7 +294,7 @@ try_exec_man (const char *page, char *relative_to) {
case 0:
/* child, run man command. */
if (relative_to != NULL) {
page = tal_fmt(page, "%s/../doc/%s.7", relative_to, page);
page = tal_fmt(page, "%s/%s.7", relative_to, page);
execlp("man", "man", "-l", page, (char *)NULL);
}
else {
@@ -701,12 +701,18 @@ int main(int argc, char *argv[])
command = argv[2];
char *page = tal_fmt(ctx, "lightning-%s", command);
/* Try to find the page in the MANPATH and PATH. */
try_exec_man(page, NULL);
/* Try to find the page relative to this executable.
* This handles the common scenario where lightning-cli
* was built from source and hasn't been installed yet */
try_exec_man(page, dirname(argv[0]));
const char *dir = dirname(argv[0]);
try_exec_man(page, tal_fmt(page, "%s/../doc", dir));
/* Try to find the page relative to this executable, but in the
* install directory hierarchy. */
try_exec_man(page, tal_fmt(page, "%s/../share/man/man7", dir));
tal_free(page);
}