From 08e2266b82b337e8cb99bac09112e7b638390463 Mon Sep 17 00:00:00 2001 From: Kubat <mael.martin31@gmail.com> Date: Tue, 12 May 2020 21:28:48 +0200 Subject: [PATCH] Update help and manpages --- doc/lektord.1 | 12 ++++++++---- src/main/server.c | 3 ++- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/doc/lektord.1 b/doc/lektord.1 index a49ff011..d1d4a421 100644 --- a/doc/lektord.1 +++ b/doc/lektord.1 @@ -25,11 +25,15 @@ commands from: .PD 0 .TP .PD -\fB\-\-help\fP / \fB\-h\fP +\fB\-h\fP Prints the help message. .TP -\fB\-\-version\fP / \fB\-v\fP -Print the version of the lektor daemon. +\fB\-f\fP <config-file> +Specify a config file manually. +.TP +\fB\-F\fP +Don't check if the database is not already opened by another instance. +Usefull in case of non-really-clean shutdown of lektord. .PP If the lektor daemon is launched without a configuration file, it will exit with the code \fB1\fP. To init the default configuration file (normally done @@ -39,7 +43,7 @@ by meson during the install), you should just use: .nf \fB % mkdir ~/.config/lektor/ -% lktadm init conf > ~/.config/lektor/lektor.ini +% lkt admin config > ~/.config/lektor/lektor.ini % lektord .fi \fR .P diff --git a/src/main/server.c b/src/main/server.c index 5a38aa68..e13c0d1c 100644 --- a/src/main/server.c +++ b/src/main/server.c @@ -49,7 +49,7 @@ main(int argc, char *argv[]) goto normal_launch; /* Check args */ - while ((opt = getopt(argc, argv, "Ff:")) != -1) { + while ((opt = getopt(argc, argv, "hFf:")) != -1) { switch (opt) { case 'F': check_exclusive = 0; @@ -57,6 +57,7 @@ main(int argc, char *argv[]) case 'f': strncpy(conf_file, optarg, PATH_MAX); break; + case 'h': default: help__(); exit(EXIT_SUCCESS); -- GitLab