From 6adcf066deb37f1a201dee9e49924448351e33db Mon Sep 17 00:00:00 2001 From: Piotr Kwiecinski Date: Thu, 23 Mar 2023 12:06:59 +0100 Subject: [PATCH] logname: move help strings to markdown file --- src/uu/logname/logname.md | 7 +++++++ src/uu/logname/src/logname.rs | 7 ++++--- 2 files changed, 11 insertions(+), 3 deletions(-) create mode 100644 src/uu/logname/logname.md diff --git a/src/uu/logname/logname.md b/src/uu/logname/logname.md new file mode 100644 index 000000000..b997c206b --- /dev/null +++ b/src/uu/logname/logname.md @@ -0,0 +1,7 @@ +# logname + +``` +logname +``` + +Print user's login name diff --git a/src/uu/logname/src/logname.rs b/src/uu/logname/src/logname.rs index fd5ab904e..b3cd06243 100644 --- a/src/uu/logname/src/logname.rs +++ b/src/uu/logname/src/logname.rs @@ -11,7 +11,7 @@ use clap::{crate_version, Command}; use std::ffi::CStr; -use uucore::{error::UResult, show_error}; +use uucore::{error::UResult, format_usage, help_about, help_usage, show_error}; extern "C" { // POSIX requires using getlogin (or equivalent code) @@ -29,7 +29,8 @@ fn get_userlogin() -> Option { } } -static ABOUT: &str = "Print user's login name"; +const ABOUT: &str = help_about!("logname.md"); +const USAGE: &str = help_usage!("logname.md"); #[uucore::main] pub fn uumain(args: impl uucore::Args) -> UResult<()> { @@ -48,7 +49,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { pub fn uu_app() -> Command { Command::new(uucore::util_name()) .version(crate_version!()) - .override_usage(uucore::execution_phrase()) + .override_usage(format_usage(USAGE)) .about(ABOUT) .infer_long_args(true) }