X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Finstall.c;h=f56c0728b932e768357c7ce51ea859529f92ffe8;hp=e30f623627eddccd5c4a94efc28446d37e9bb990;hb=51cfdda7e2132e0d4a39645840608ba7028073dd;hpb=c32dd69b46c6311148ed666095a13c5e6173c744 diff --git a/src/install.c b/src/install.c index e30f62362..f56c0728b 100644 --- a/src/install.c +++ b/src/install.c @@ -59,13 +59,13 @@ Hashmap *will_install = NULL, *have_installed = NULL; static int help(void) { - printf("%s [options]\n\n" + printf("%s [OPTIONS...] {COMMAND} ...\n\n" "Install init system units.\n\n" " -h --help Show this help\n" " --force Override existing links\n" " --system Install into system\n" " --session Install into session\n" - " --global Install into all sessions\n" + " --global Install into all sessions\n\n" "Commands:\n" " enable [NAME...] Enable one or more units\n" " disable [NAME...] Disable one or more units\n" @@ -132,7 +132,7 @@ static int parse_argv(int argc, char *argv[]) { } if (optind >= argc) { - log_error("Missing verb."); + help(); return -EINVAL; } @@ -143,7 +143,7 @@ static int parse_argv(int argc, char *argv[]) { else if (streq(argv[optind], "test")) arg_action = ACTION_TEST; else { - log_error("Unknown verb %s", argv[optind]); + log_error("Unknown verb %s.", argv[optind]); return -EINVAL; } @@ -535,7 +535,7 @@ int main(int argc, char *argv[]) { goto finish; } - if ((r = lookup_paths_init(&paths, arg_where == WHERE_SYSTEM ? MANAGER_INIT : MANAGER_SESSION)) < 0) { + if ((r = lookup_paths_init(&paths, arg_where == WHERE_SYSTEM ? MANAGER_SYSTEM : MANAGER_SESSION)) < 0) { log_error("Failed to determine lookup paths: %s", strerror(-r)); goto finish; }