diff --git a/src/uu/mv/mv.md b/src/uu/mv/mv.md new file mode 100644 index 000000000..772e4bfaf --- /dev/null +++ b/src/uu/mv/mv.md @@ -0,0 +1,9 @@ +# mv + +``` +mv [OPTION]... [-T] SOURCE DEST +mv [OPTION]... SOURCE... DIRECTORY +mv [OPTION]... -t DIRECTORY SOURCE... +``` + +Move `SOURCE` to `DEST`, or multiple `SOURCE`(s) to `DIRECTORY`. diff --git a/src/uu/mv/src/mv.rs b/src/uu/mv/src/mv.rs index 0a1394594..d3a6d2ed0 100644 --- a/src/uu/mv/src/mv.rs +++ b/src/uu/mv/src/mv.rs @@ -25,7 +25,7 @@ use std::path::{Path, PathBuf}; use uucore::backup_control::{self, BackupMode}; use uucore::display::Quotable; use uucore::error::{FromIo, UError, UResult, USimpleError, UUsageError}; -use uucore::{format_usage, prompt_yes, show}; +use uucore::{format_usage, help_about, help_usage, prompt_yes, show}; use fs_extra::dir::{ get_size as dir_get_size, move_dir, move_dir_with_progress, CopyOptions as DirCopyOptions, @@ -53,12 +53,8 @@ pub enum OverwriteMode { Force, } -static ABOUT: &str = "Move SOURCE to DEST, or multiple SOURCE(s) to DIRECTORY."; -static LONG_HELP: &str = ""; -const USAGE: &str = "\ - {} [OPTION]... [-T] SOURCE DEST - {} [OPTION]... SOURCE... DIRECTORY - {} [OPTION]... -t DIRECTORY SOURCE..."; +const ABOUT: &str = help_about!("mv.md"); +const USAGE: &str = help_usage!("mv.md"); static OPT_FORCE: &str = "force"; static OPT_INTERACTIVE: &str = "interactive"; @@ -73,12 +69,7 @@ static ARG_FILES: &str = "files"; #[uucore::main] pub fn uumain(args: impl uucore::Args) -> UResult<()> { - let help = format!( - "{}\n{}", - LONG_HELP, - backup_control::BACKUP_CONTROL_LONG_HELP - ); - let mut app = uu_app().after_help(help); + let mut app = uu_app().after_help(backup_control::BACKUP_CONTROL_LONG_HELP); let matches = app.try_get_matches_from_mut(args)?; if !matches.contains_id(OPT_TARGET_DIRECTORY)