From f06d46ef293aa60dbe5a279aa720e8379fffb347 Mon Sep 17 00:00:00 2001 From: Koki Ueha Date: Mon, 27 Feb 2023 14:13:06 +0000 Subject: [PATCH] dirname: move help strings to markdown file --- src/uu/dirname/dirname.md | 12 ++++++++++++ src/uu/dirname/src/dirname.rs | 12 +++++------- 2 files changed, 17 insertions(+), 7 deletions(-) create mode 100644 src/uu/dirname/dirname.md diff --git a/src/uu/dirname/dirname.md b/src/uu/dirname/dirname.md new file mode 100644 index 000000000..f08c1c4c9 --- /dev/null +++ b/src/uu/dirname/dirname.md @@ -0,0 +1,12 @@ +# dirname + +``` +dirname [OPTION] NAME... +``` + +Strip last component from file name + +## After Help + +Output each NAME with its last non-slash component and trailing slashes +removed; if NAME contains no /'s, output '.' (meaning the current directory). diff --git a/src/uu/dirname/src/dirname.rs b/src/uu/dirname/src/dirname.rs index bebdd4d36..687aaa550 100644 --- a/src/uu/dirname/src/dirname.rs +++ b/src/uu/dirname/src/dirname.rs @@ -9,13 +9,11 @@ use clap::{crate_version, Arg, ArgAction, Command}; use std::path::Path; use uucore::display::print_verbatim; use uucore::error::{UResult, UUsageError}; -use uucore::format_usage; +use uucore::{format_usage, help_about, help_section, help_usage}; -const ABOUT: &str = "Strip last component from file name"; -const USAGE: &str = "{} [OPTION] NAME..."; -const LONG_USAGE: &str = "\ - Output each NAME with its last non-slash component and trailing slashes \n\ - removed; if NAME contains no /'s, output '.' (meaning the current directory)."; +const ABOUT: &str = help_about!("dirname.md"); +const USAGE: &str = help_usage!("dirname.md"); +const AFTER_HELP: &str = help_section!("after help", "dirname.md"); mod options { pub const ZERO: &str = "zero"; @@ -26,7 +24,7 @@ mod options { pub fn uumain(args: impl uucore::Args) -> UResult<()> { let args = args.collect_lossy(); - let matches = uu_app().after_help(LONG_USAGE).try_get_matches_from(args)?; + let matches = uu_app().after_help(AFTER_HELP).try_get_matches_from(args)?; let separator = if matches.get_flag(options::ZERO) { "\0"