diff --git a/src/uu/arch/src/arch.rs b/src/uu/arch/src/arch.rs index f07eb227c41..d0a197ece22 100644 --- a/src/uu/arch/src/arch.rs +++ b/src/uu/arch/src/arch.rs @@ -21,9 +21,9 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { } pub fn uu_app() -> Command { - Command::new(uucore::util_name()) + Command::new("arch") .version(uucore::crate_version!()) - .help_template(uucore::localized_help_template(uucore::util_name())) + .help_template(uucore::localized_help_template("arch")) .about(translate!("arch-about")) .after_help(translate!("arch-after-help")) .override_usage(translate!("arch-usage")) diff --git a/src/uu/basename/src/basename.rs b/src/uu/basename/src/basename.rs index 3ec5cb7c5b3..ee0c90ae0b8 100644 --- a/src/uu/basename/src/basename.rs +++ b/src/uu/basename/src/basename.rs @@ -80,9 +80,9 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { } pub fn uu_app() -> Command { - Command::new(uucore::util_name()) + Command::new("basename") .version(uucore::crate_version!()) - .help_template(uucore::localized_help_template(uucore::util_name())) + .help_template(uucore::localized_help_template("basename")) .about(translate!("basename-about")) .override_usage(format_usage(&translate!("basename-usage"))) .infer_long_args(true) diff --git a/src/uu/cat/src/cat.rs b/src/uu/cat/src/cat.rs index aef7d5eab50..687070cb6d6 100644 --- a/src/uu/cat/src/cat.rs +++ b/src/uu/cat/src/cat.rs @@ -268,11 +268,11 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { } pub fn uu_app() -> Command { - Command::new(uucore::util_name()) + Command::new("cat") .version(uucore::crate_version!()) .override_usage(format_usage(&translate!("cat-usage"))) .about(translate!("cat-about")) - .help_template(uucore::localized_help_template(uucore::util_name())) + .help_template(uucore::localized_help_template("cat")) .infer_long_args(true) .args_override_self(true) .arg( @@ -420,11 +420,11 @@ where Ok(()) } else { // each next line is expected to display "cat: …" - let line_joiner = format!("\n{}: ", uucore::util_name()); + let line_joiner = "\ncat: "; Err(uucore::error::USimpleError::new( error_messages.len() as i32, - error_messages.join(&line_joiner), + error_messages.join(line_joiner), )) } } diff --git a/src/uu/chcon/src/chcon.rs b/src/uu/chcon/src/chcon.rs index 685ad0dcf0d..9953c064fd3 100644 --- a/src/uu/chcon/src/chcon.rs +++ b/src/uu/chcon/src/chcon.rs @@ -156,7 +156,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { } pub fn uu_app() -> Command { - let cmd = Command::new(uucore::util_name()) + let cmd = Command::new("chcon") .version(uucore::crate_version!()) .about(translate!("chcon-about")) .override_usage(format_usage(&translate!("chcon-usage"))) @@ -613,7 +613,7 @@ fn process_file( if options.verbose { println!( "{}", - translate!("chcon-verbose-changing-context", "util_name" => uucore::util_name(), "file" => file_full_name.quote()) + translate!("chcon-verbose-changing-context", "util_name" => "chcon", "file" => file_full_name.quote()) ); } diff --git a/src/uu/chgrp/src/chgrp.rs b/src/uu/chgrp/src/chgrp.rs index cd890e49a6f..0e41a67601b 100644 --- a/src/uu/chgrp/src/chgrp.rs +++ b/src/uu/chgrp/src/chgrp.rs @@ -98,7 +98,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { } pub fn uu_app() -> Command { - let cmd = Command::new(uucore::util_name()) + let cmd = Command::new("chgrp") .version(uucore::crate_version!()) .about(translate!("chgrp-about")) .override_usage(format_usage(&translate!("chgrp-usage"))) diff --git a/src/uu/chmod/src/chmod.rs b/src/uu/chmod/src/chmod.rs index d77378da453..48d29b4eb6b 100644 --- a/src/uu/chmod/src/chmod.rs +++ b/src/uu/chmod/src/chmod.rs @@ -175,11 +175,11 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { } pub fn uu_app() -> Command { - Command::new(uucore::util_name()) + Command::new("chmod") .version(uucore::crate_version!()) .about(translate!("chmod-about")) .override_usage(format_usage(&translate!("chmod-usage"))) - .help_template(uucore::localized_help_template(uucore::util_name())) + .help_template(uucore::localized_help_template("chmod")) .args_override_self(true) .infer_long_args(true) .no_binary_name(true) diff --git a/src/uu/chown/src/chown.rs b/src/uu/chown/src/chown.rs index 6f0599ce811..bb5cc1227ee 100644 --- a/src/uu/chown/src/chown.rs +++ b/src/uu/chown/src/chown.rs @@ -75,9 +75,9 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { } pub fn uu_app() -> Command { - Command::new(uucore::util_name()) + Command::new("chown") .version(uucore::crate_version!()) - .help_template(uucore::localized_help_template(uucore::util_name())) + .help_template(uucore::localized_help_template("chown")) .about(translate!("chown-about")) .override_usage(format_usage(&translate!("chown-usage"))) .infer_long_args(true) diff --git a/src/uu/chroot/src/chroot.rs b/src/uu/chroot/src/chroot.rs index a08e4b0cc9a..68e8fe2ed05 100644 --- a/src/uu/chroot/src/chroot.rs +++ b/src/uu/chroot/src/chroot.rs @@ -220,7 +220,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { } pub fn uu_app() -> Command { - let cmd = Command::new(uucore::util_name()) + let cmd = Command::new("chroot") .version(uucore::crate_version!()) .about(translate!("chroot-about")) .override_usage(format_usage(&translate!("chroot-usage"))) diff --git a/src/uu/comm/src/comm.rs b/src/uu/comm/src/comm.rs index 9257c1b7d1a..395c561e10e 100644 --- a/src/uu/comm/src/comm.rs +++ b/src/uu/comm/src/comm.rs @@ -374,9 +374,9 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { } pub fn uu_app() -> Command { - Command::new(uucore::util_name()) + Command::new("comm") .version(uucore::crate_version!()) - .help_template(uucore::localized_help_template(uucore::util_name())) + .help_template(uucore::localized_help_template("comm")) .about(translate!("comm-about")) .override_usage(format_usage(&translate!("comm-usage"))) .infer_long_args(true) diff --git a/src/uu/cp/src/cp.rs b/src/uu/cp/src/cp.rs index 403a8892da5..0e8ace2af19 100644 --- a/src/uu/cp/src/cp.rs +++ b/src/uu/cp/src/cp.rs @@ -521,7 +521,7 @@ pub fn uu_app() -> Command { options::ATTRIBUTES_ONLY, options::COPY_CONTENTS, ]; - Command::new(uucore::util_name()) + Command::new("cp") .version(uucore::crate_version!()) .about(translate!("cp-about")) .help_template(uucore::localized_help_template(uucore::util_name())) @@ -1404,7 +1404,7 @@ pub fn copy(sources: &[PathBuf], target: &Path, options: &Options) -> CopyResult ) .unwrap(), ) - .with_message(uucore::util_name()); + .with_message("cp"); pb.tick(); Some(pb) } else { diff --git a/src/uu/csplit/src/csplit.rs b/src/uu/csplit/src/csplit.rs index 4445eb75668..3a4b43e881e 100644 --- a/src/uu/csplit/src/csplit.rs +++ b/src/uu/csplit/src/csplit.rs @@ -645,7 +645,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { } pub fn uu_app() -> Command { - Command::new(uucore::util_name()) + Command::new("csplit") .version(uucore::crate_version!()) .help_template(uucore::localized_help_template(uucore::util_name())) .about(translate!("csplit-about")) diff --git a/src/uu/cut/src/cut.rs b/src/uu/cut/src/cut.rs index e0568e810e4..1e0cf90bcd8 100644 --- a/src/uu/cut/src/cut.rs +++ b/src/uu/cut/src/cut.rs @@ -680,7 +680,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { } pub fn uu_app() -> Command { - Command::new(uucore::util_name()) + Command::new("cut") .version(uucore::crate_version!()) .help_template(uucore::localized_help_template(uucore::util_name())) .override_usage(format_usage(&translate!("cut-usage"))) diff --git a/src/uu/date/src/date.rs b/src/uu/date/src/date.rs index e577d081c49..046d5f18f62 100644 --- a/src/uu/date/src/date.rs +++ b/src/uu/date/src/date.rs @@ -591,7 +591,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { } pub fn uu_app() -> Command { - Command::new(uucore::util_name()) + Command::new("date") .version(uucore::crate_version!()) .help_template(uucore::localized_help_template(uucore::util_name())) .about(translate!("date-about")) diff --git a/src/uu/dd/src/dd.rs b/src/uu/dd/src/dd.rs index e1d7b0ad6b2..db91b92aa44 100644 --- a/src/uu/dd/src/dd.rs +++ b/src/uu/dd/src/dd.rs @@ -1535,7 +1535,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { } pub fn uu_app() -> Command { - Command::new(uucore::util_name()) + Command::new("dd") .version(uucore::crate_version!()) .help_template(uucore::localized_help_template(uucore::util_name())) .about(translate!("dd-about")) diff --git a/src/uu/df/src/df.rs b/src/uu/df/src/df.rs index 51b950dd460..0326c790cda 100644 --- a/src/uu/df/src/df.rs +++ b/src/uu/df/src/df.rs @@ -142,7 +142,7 @@ enum OptionsError { .0.iter() .map(|t| translate!("df-error-filesystem-type-both-selected-and-excluded", "type" => t.quote())) .collect::>() - .join(format!("\n{}: ", uucore::util_name()).as_str()) + .join("\ndf: ") )] FilesystemTypeBothSelectedAndExcluded(Vec), } @@ -451,7 +451,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { if matches.get_flag(OPT_INODES) { println!( "{}", - translate!("df-error-inodes-not-supported-windows", "program" => uucore::util_name()) + translate!("df-error-inodes-not-supported-windows", "program" => "df") ); return Ok(()); } @@ -498,7 +498,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { } pub fn uu_app() -> Command { - Command::new(uucore::util_name()) + Command::new("df") .version(uucore::crate_version!()) .help_template(uucore::localized_help_template(uucore::util_name())) .about(translate!("df-about")) diff --git a/src/uu/dircolors/src/dircolors.rs b/src/uu/dircolors/src/dircolors.rs index 3eb2593a51a..154d879b671 100644 --- a/src/uu/dircolors/src/dircolors.rs +++ b/src/uu/dircolors/src/dircolors.rs @@ -238,9 +238,9 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { } pub fn uu_app() -> Command { - Command::new(uucore::util_name()) + Command::new("dircolors") .version(uucore::crate_version!()) - .help_template(uucore::localized_help_template(uucore::util_name())) + .help_template(uucore::localized_help_template("dircolors")) .about(translate!("dircolors-about")) .after_help(translate!("dircolors-after-help")) .override_usage(format_usage(&translate!("dircolors-usage"))) diff --git a/src/uu/dirname/src/dirname.rs b/src/uu/dirname/src/dirname.rs index 09bf9928a3a..07a1517af3b 100644 --- a/src/uu/dirname/src/dirname.rs +++ b/src/uu/dirname/src/dirname.rs @@ -143,10 +143,10 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { } pub fn uu_app() -> Command { - Command::new(uucore::util_name()) + Command::new("dirname") .about(translate!("dirname-about")) .version(uucore::crate_version!()) - .help_template(uucore::localized_help_template(uucore::util_name())) + .help_template(uucore::localized_help_template("dirname")) .override_usage(format_usage(&translate!("dirname-usage"))) .args_override_self(true) .infer_long_args(true) diff --git a/src/uu/du/src/du.rs b/src/uu/du/src/du.rs index bb8c4d88561..7ccfdf5a228 100644 --- a/src/uu/du/src/du.rs +++ b/src/uu/du/src/du.rs @@ -1287,7 +1287,7 @@ fn parse_depth(max_depth_str: Option<&str>, summarize: bool) -> UResult Command { - Command::new(uucore::util_name()) + Command::new("du") .version(uucore::crate_version!()) .help_template(uucore::localized_help_template(uucore::util_name())) .about(translate!("du-about")) diff --git a/src/uu/expand/src/expand.rs b/src/uu/expand/src/expand.rs index 088e8aaa363..4c3b09f64b7 100644 --- a/src/uu/expand/src/expand.rs +++ b/src/uu/expand/src/expand.rs @@ -249,7 +249,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { pub fn uu_app() -> Command { uucore::clap_localization::configure_localized_command( - Command::new(uucore::util_name()) + Command::new("expand") .version(uucore::crate_version!()) .about(translate!("expand-about")) .override_usage(format_usage(&translate!("expand-usage"))), diff --git a/src/uu/expr/src/expr.rs b/src/uu/expr/src/expr.rs index f2bec49e8d7..9392fcee72c 100644 --- a/src/uu/expr/src/expr.rs +++ b/src/uu/expr/src/expr.rs @@ -71,9 +71,9 @@ impl UError for ExprError { } pub fn uu_app() -> Command { - Command::new(uucore::util_name()) + Command::new("expr") .version(uucore::crate_version!()) - .help_template(uucore::localized_help_template(uucore::util_name())) + .help_template(uucore::localized_help_template("expr")) .about(translate!("expr-about")) .override_usage(format_usage(&translate!("expr-usage"))) .after_help(translate!("expr-after-help")) @@ -111,12 +111,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { if args.len() == 1 && args[0] == b"--help" { uu_app().print_help()?; } else if args.len() == 1 && args[0] == b"--version" { - writeln!( - stdout(), - "{} {}", - uucore::util_name(), - uucore::crate_version!() - )?; + writeln!(stdout(), "expr {}", uucore::crate_version!())?; } else { // The first argument may be "--" and should be be ignored. let args = if !args.is_empty() && args[0] == b"--" { diff --git a/src/uu/factor/src/factor.rs b/src/uu/factor/src/factor.rs index 5d381d9d393..4d3d82c52b9 100644 --- a/src/uu/factor/src/factor.rs +++ b/src/uu/factor/src/factor.rs @@ -218,7 +218,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { } pub fn uu_app() -> Command { - Command::new(uucore::util_name()) + Command::new("factor") .version(uucore::crate_version!()) .help_template(uucore::localized_help_template(uucore::util_name())) .about(translate!("factor-about")) diff --git a/src/uu/fmt/src/fmt.rs b/src/uu/fmt/src/fmt.rs index 42f92d6437f..5f34d062519 100644 --- a/src/uu/fmt/src/fmt.rs +++ b/src/uu/fmt/src/fmt.rs @@ -356,9 +356,9 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { } pub fn uu_app() -> Command { - Command::new(uucore::util_name()) + Command::new("fmt") .version(uucore::crate_version!()) - .help_template(uucore::localized_help_template(uucore::util_name())) + .help_template(uucore::localized_help_template("fmt")) .about(translate!("fmt-about")) .override_usage(format_usage(&translate!("fmt-usage"))) .infer_long_args(true) diff --git a/src/uu/fold/src/fold.rs b/src/uu/fold/src/fold.rs index 76ef483bf31..e7b1688579b 100644 --- a/src/uu/fold/src/fold.rs +++ b/src/uu/fold/src/fold.rs @@ -82,7 +82,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { } pub fn uu_app() -> Command { - Command::new(uucore::util_name()) + Command::new("fold") .version(uucore::crate_version!()) .help_template(uucore::localized_help_template(uucore::util_name())) .override_usage(format_usage(&translate!("fold-usage"))) diff --git a/src/uu/groups/src/groups.rs b/src/uu/groups/src/groups.rs index eed278ed7f4..86128fc63b8 100644 --- a/src/uu/groups/src/groups.rs +++ b/src/uu/groups/src/groups.rs @@ -80,9 +80,9 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { } pub fn uu_app() -> Command { - Command::new(uucore::util_name()) + Command::new("groups") .version(uucore::crate_version!()) - .help_template(uucore::localized_help_template(uucore::util_name())) + .help_template(uucore::localized_help_template("groups")) .about(translate!("groups-about")) .override_usage(format_usage(&translate!("groups-usage"))) .infer_long_args(true) diff --git a/src/uu/head/src/head.rs b/src/uu/head/src/head.rs index 428d62443a1..e15603c78c6 100644 --- a/src/uu/head/src/head.rs +++ b/src/uu/head/src/head.rs @@ -67,9 +67,9 @@ impl UError for HeadError { type HeadResult = Result; pub fn uu_app() -> Command { - Command::new(uucore::util_name()) + Command::new("head") .version(uucore::crate_version!()) - .help_template(uucore::localized_help_template(uucore::util_name())) + .help_template(uucore::localized_help_template("head")) .about(translate!("head-about")) .override_usage(format_usage(&translate!("head-usage"))) .infer_long_args(true) diff --git a/src/uu/hostid/src/hostid.rs b/src/uu/hostid/src/hostid.rs index 041dc232344..c432a6989c8 100644 --- a/src/uu/hostid/src/hostid.rs +++ b/src/uu/hostid/src/hostid.rs @@ -35,9 +35,9 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { } pub fn uu_app() -> Command { - Command::new(uucore::util_name()) + Command::new("hostid") .version(uucore::crate_version!()) - .help_template(uucore::localized_help_template(uucore::util_name())) + .help_template(uucore::localized_help_template("hostid")) .about(translate!("hostid-about")) .override_usage(format_usage(&translate!("hostid-usage"))) .infer_long_args(true) diff --git a/src/uu/hostname/src/hostname.rs b/src/uu/hostname/src/hostname.rs index 70c20e780f3..ec0dd75edda 100644 --- a/src/uu/hostname/src/hostname.rs +++ b/src/uu/hostname/src/hostname.rs @@ -75,7 +75,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { } pub fn uu_app() -> Command { - Command::new(uucore::util_name()) + Command::new("hostname") .version(uucore::crate_version!()) .help_template(uucore::localized_help_template(uucore::util_name())) .about(translate!("hostname-about")) diff --git a/src/uu/id/src/id.rs b/src/uu/id/src/id.rs index ff58c711647..78b0ad2d390 100644 --- a/src/uu/id/src/id.rs +++ b/src/uu/id/src/id.rs @@ -361,9 +361,9 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { } pub fn uu_app() -> Command { - Command::new(uucore::util_name()) + Command::new("id") .version(uucore::crate_version!()) - .help_template(uucore::localized_help_template(uucore::util_name())) + .help_template(uucore::localized_help_template("id")) .about(translate!("id-about")) .override_usage(format_usage(&translate!("id-usage"))) .infer_long_args(true) diff --git a/src/uu/install/src/install.rs b/src/uu/install/src/install.rs index a683ff9b908..596d9ebf35d 100644 --- a/src/uu/install/src/install.rs +++ b/src/uu/install/src/install.rs @@ -70,7 +70,7 @@ pub struct Behavior { #[derive(Error, Debug)] enum InstallError { - #[error("{}", translate!("install-error-dir-needs-arg", "util_name" => uucore::util_name()))] + #[error("{}", translate!("install-error-dir-needs-arg", "util_name" => "install"))] DirNeedsArg, #[error("{}", translate!("install-error-create-dir-failed", "path" => .0.quote()))] @@ -193,9 +193,9 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { } pub fn uu_app() -> Command { - Command::new(uucore::util_name()) + Command::new("install") .version(uucore::crate_version!()) - .help_template(uucore::localized_help_template(uucore::util_name())) + .help_template(uucore::localized_help_template("install")) .about(translate!("install-about")) .override_usage(format_usage(&translate!("install-usage"))) .infer_long_args(true) diff --git a/src/uu/join/src/join.rs b/src/uu/join/src/join.rs index 1d6801ba47f..3f95be4bc51 100644 --- a/src/uu/join/src/join.rs +++ b/src/uu/join/src/join.rs @@ -863,7 +863,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { } pub fn uu_app() -> Command { - Command::new(uucore::util_name()) + Command::new("join") .version(uucore::crate_version!()) .help_template(uucore::localized_help_template(uucore::util_name())) .about(translate!("join-about")) diff --git a/src/uu/kill/src/kill.rs b/src/uu/kill/src/kill.rs index 81186b5cb5a..e92a47da3b4 100644 --- a/src/uu/kill/src/kill.rs +++ b/src/uu/kill/src/kill.rs @@ -100,9 +100,9 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { } pub fn uu_app() -> Command { - Command::new(uucore::util_name()) + Command::new("kill") .version(uucore::crate_version!()) - .help_template(uucore::localized_help_template(uucore::util_name())) + .help_template(uucore::localized_help_template("kill")) .about(translate!("kill-about")) .override_usage(format_usage(&translate!("kill-usage"))) .infer_long_args(true) diff --git a/src/uu/link/src/link.rs b/src/uu/link/src/link.rs index 12ebbbee916..7af8dd0905c 100644 --- a/src/uu/link/src/link.rs +++ b/src/uu/link/src/link.rs @@ -34,9 +34,9 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { } pub fn uu_app() -> Command { - Command::new(uucore::util_name()) + Command::new("link") .version(uucore::crate_version!()) - .help_template(uucore::localized_help_template(uucore::util_name())) + .help_template(uucore::localized_help_template("link")) .about(translate!("link-about")) .override_usage(format_usage(&translate!("link-usage"))) .infer_long_args(true) diff --git a/src/uu/ln/src/ln.rs b/src/uu/ln/src/ln.rs index 1c7d40b8476..6547ce1d5c6 100644 --- a/src/uu/ln/src/ln.rs +++ b/src/uu/ln/src/ln.rs @@ -143,9 +143,9 @@ pub fn uu_app() -> Command { backup_control::BACKUP_CONTROL_LONG_HELP ); - Command::new(uucore::util_name()) + Command::new("ln") .version(uucore::crate_version!()) - .help_template(uucore::localized_help_template(uucore::util_name())) + .help_template(uucore::localized_help_template("ln")) .about(translate!("ln-about")) .override_usage(format_usage(&translate!("ln-usage"))) .infer_long_args(true) diff --git a/src/uu/logname/src/logname.rs b/src/uu/logname/src/logname.rs index 32b0c85105c..cb69ade7c27 100644 --- a/src/uu/logname/src/logname.rs +++ b/src/uu/logname/src/logname.rs @@ -36,9 +36,9 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { } pub fn uu_app() -> Command { - Command::new(uucore::util_name()) + Command::new("logname") .version(uucore::crate_version!()) - .help_template(uucore::localized_help_template(uucore::util_name())) + .help_template(uucore::localized_help_template("logname")) .override_usage(translate!("logname-usage")) .about(translate!("logname-about")) .infer_long_args(true) diff --git a/src/uu/mkdir/src/mkdir.rs b/src/uu/mkdir/src/mkdir.rs index 3d0a9bc33c9..5db16c1d601 100644 --- a/src/uu/mkdir/src/mkdir.rs +++ b/src/uu/mkdir/src/mkdir.rs @@ -104,9 +104,9 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { } pub fn uu_app() -> Command { - Command::new(uucore::util_name()) + Command::new("mkdir") .version(uucore::crate_version!()) - .help_template(uucore::localized_help_template(uucore::util_name())) + .help_template(uucore::localized_help_template("mkdir")) .about(translate!("mkdir-about")) .override_usage(format_usage(&translate!("mkdir-usage"))) .infer_long_args(true) @@ -316,7 +316,7 @@ fn create_single_dir(path: &Path, is_parent: bool, config: &Config) -> UResult<( writeln!( stdout(), "{}", - translate!("mkdir-verbose-created-directory", "util_name" => uucore::util_name(), "path" => path.quote()) + translate!("mkdir-verbose-created-directory", "util_name" => "mkdir", "path" => path.quote()) )?; } @@ -366,7 +366,7 @@ fn create_single_dir(path: &Path, is_parent: bool, config: &Config) -> UResult<( writeln!( stdout(), "{}", - translate!("mkdir-verbose-created-directory", "util_name" => uucore::util_name(), "path" => path.quote()) + translate!("mkdir-verbose-created-directory", "util_name" => "mkdir", "path" => path.quote()) )?; } Ok(()) diff --git a/src/uu/mkfifo/src/mkfifo.rs b/src/uu/mkfifo/src/mkfifo.rs index a70d140c7c6..a48a4894ee6 100644 --- a/src/uu/mkfifo/src/mkfifo.rs +++ b/src/uu/mkfifo/src/mkfifo.rs @@ -97,9 +97,9 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { } pub fn uu_app() -> Command { - Command::new(uucore::util_name()) + Command::new("mkfifo") .version(uucore::crate_version!()) - .help_template(uucore::localized_help_template(uucore::util_name())) + .help_template(uucore::localized_help_template("mkfifo")) .override_usage(format_usage(&translate!("mkfifo-usage"))) .about(translate!("mkfifo-about")) .infer_long_args(true) diff --git a/src/uu/mknod/src/mknod.rs b/src/uu/mknod/src/mknod.rs index 9b6ab45f648..39ac62cb62d 100644 --- a/src/uu/mknod/src/mknod.rs +++ b/src/uu/mknod/src/mknod.rs @@ -104,7 +104,8 @@ fn mknod(file_name: &str, config: Config) -> i32 { ) { // if it fails, delete the file let _ = std::fs::remove_file(file_name); - eprintln!("{}: {e}", uucore::util_name()); + use std::io::{Write, stderr}; + let _ = writeln!(stderr(), "mknod: {e}"); return 1; } } @@ -117,7 +118,8 @@ fn mknod(file_name: &str, config: Config) -> i32 { std::fs::remove_file(p) }) { - eprintln!("{}: {e}", uucore::util_name()); + use std::io::{Write, stderr}; + let _ = writeln!(stderr(), "mknod: {e}"); return 1; } } @@ -189,9 +191,9 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { } pub fn uu_app() -> Command { - Command::new(uucore::util_name()) + Command::new("mknod") .version(uucore::crate_version!()) - .help_template(uucore::localized_help_template(uucore::util_name())) + .help_template(uucore::localized_help_template("mknod")) .override_usage(format_usage(&translate!("mknod-usage"))) .after_help(translate!("mknod-after-help")) .about(translate!("mknod-about")) diff --git a/src/uu/mktemp/src/mktemp.rs b/src/uu/mktemp/src/mktemp.rs index f45c676bede..f0cd78cfe55 100644 --- a/src/uu/mktemp/src/mktemp.rs +++ b/src/uu/mktemp/src/mktemp.rs @@ -434,9 +434,9 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { } pub fn uu_app() -> Command { - Command::new(uucore::util_name()) + Command::new("mktemp") .version(uucore::crate_version!()) - .help_template(uucore::localized_help_template(uucore::util_name())) + .help_template(uucore::localized_help_template("mktemp")) .about(translate!("mktemp-about")) .override_usage(format_usage(&translate!("mktemp-usage"))) .infer_long_args(true) diff --git a/src/uu/more/src/more.rs b/src/uu/more/src/more.rs index f31521a6e08..0ad3006024c 100644 --- a/src/uu/more/src/more.rs +++ b/src/uu/more/src/more.rs @@ -206,11 +206,11 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { } pub fn uu_app() -> Command { - Command::new(uucore::util_name()) + Command::new("more") .about(translate!("more-about")) .override_usage(format_usage(&translate!("more-usage"))) .version(uucore::crate_version!()) - .help_template(uucore::localized_help_template(uucore::util_name())) + .help_template(uucore::localized_help_template("more")) .infer_long_args(true) .arg( Arg::new(options::SILENT) diff --git a/src/uu/mv/src/mv.rs b/src/uu/mv/src/mv.rs index 517e70a4fc6..67f709c5ed2 100644 --- a/src/uu/mv/src/mv.rs +++ b/src/uu/mv/src/mv.rs @@ -226,7 +226,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { } pub fn uu_app() -> Command { - Command::new(uucore::util_name()) + Command::new("mv") .version(uucore::crate_version!()) .about(translate!("mv-about")) .help_template(uucore::localized_help_template(uucore::util_name())) diff --git a/src/uu/nice/src/nice.rs b/src/uu/nice/src/nice.rs index 1abb7e96ff1..5e16162c194 100644 --- a/src/uu/nice/src/nice.rs +++ b/src/uu/nice/src/nice.rs @@ -153,7 +153,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { // exit code when failing to write the advisory is 125, but Rust // will produce an exit code of 101 when it panics. if unsafe { libc::setpriority(PRIO_PROCESS, 0, niceness) } == -1 { - let warning_msg = translate!("nice-warning-setpriority", "util_name" => uucore::util_name(), "error" => Error::last_os_error()); + let warning_msg = translate!("nice-warning-setpriority", "util_name" => "nice", "error" => Error::last_os_error()); if write!(std::io::stderr(), "{warning_msg}").is_err() { set_exit_code(125); @@ -179,13 +179,13 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { } pub fn uu_app() -> Command { - Command::new(uucore::util_name()) + Command::new("nice") .about(translate!("nice-about")) .override_usage(format_usage(&translate!("nice-usage"))) .trailing_var_arg(true) .infer_long_args(true) .version(uucore::crate_version!()) - .help_template(uucore::localized_help_template(uucore::util_name())) + .help_template(uucore::localized_help_template("nice")) .arg( Arg::new(options::ADJUSTMENT) .short('n') diff --git a/src/uu/nl/src/nl.rs b/src/uu/nl/src/nl.rs index f32bed18b2c..b9d62c4a7e4 100644 --- a/src/uu/nl/src/nl.rs +++ b/src/uu/nl/src/nl.rs @@ -265,7 +265,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { } pub fn uu_app() -> Command { - Command::new(uucore::util_name()) + Command::new("nl") .about(translate!("nl-about")) .version(uucore::crate_version!()) .help_template(uucore::localized_help_template(uucore::util_name())) diff --git a/src/uu/nohup/src/nohup.rs b/src/uu/nohup/src/nohup.rs index c09872c8829..e89b6b988bc 100644 --- a/src/uu/nohup/src/nohup.rs +++ b/src/uu/nohup/src/nohup.rs @@ -94,9 +94,9 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { } pub fn uu_app() -> Command { - Command::new(uucore::util_name()) + Command::new("nohup") .version(uucore::crate_version!()) - .help_template(uucore::localized_help_template(uucore::util_name())) + .help_template(uucore::localized_help_template("nohup")) .about(translate!("nohup-about")) .after_help(translate!("nohup-after-help")) .override_usage(format_usage(&translate!("nohup-usage"))) diff --git a/src/uu/nproc/src/nproc.rs b/src/uu/nproc/src/nproc.rs index bc6a8a30007..9edf21bf613 100644 --- a/src/uu/nproc/src/nproc.rs +++ b/src/uu/nproc/src/nproc.rs @@ -86,9 +86,9 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { } pub fn uu_app() -> Command { - Command::new(uucore::util_name()) + Command::new("nproc") .version(uucore::crate_version!()) - .help_template(uucore::localized_help_template(uucore::util_name())) + .help_template(uucore::localized_help_template("nproc")) .about(translate!("nproc-about")) .override_usage(format_usage(&translate!("nproc-usage"))) .infer_long_args(true) diff --git a/src/uu/od/src/od.rs b/src/uu/od/src/od.rs index 67992d76955..1a16b9276dd 100644 --- a/src/uu/od/src/od.rs +++ b/src/uu/od/src/od.rs @@ -290,9 +290,9 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { } pub fn uu_app() -> Command { - Command::new(uucore::util_name()) + Command::new("od") .version(uucore::crate_version!()) - .help_template(uucore::localized_help_template(uucore::util_name())) + .help_template(uucore::localized_help_template("od")) .about(translate!("od-about")) .override_usage(format_usage(&translate!("od-usage"))) .after_help(translate!("od-after-help")) diff --git a/src/uu/paste/src/paste.rs b/src/uu/paste/src/paste.rs index 3d3fc3ffdab..95638c30bb4 100644 --- a/src/uu/paste/src/paste.rs +++ b/src/uu/paste/src/paste.rs @@ -42,9 +42,9 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { } pub fn uu_app() -> Command { - Command::new(uucore::util_name()) + Command::new("paste") .version(uucore::crate_version!()) - .help_template(uucore::localized_help_template(uucore::util_name())) + .help_template(uucore::localized_help_template("paste")) .about(translate!("paste-about")) .override_usage(format_usage(&translate!("paste-usage"))) .infer_long_args(true) diff --git a/src/uu/pathchk/src/pathchk.rs b/src/uu/pathchk/src/pathchk.rs index 8ba3f4d37ac..d520e583eaf 100644 --- a/src/uu/pathchk/src/pathchk.rs +++ b/src/uu/pathchk/src/pathchk.rs @@ -81,9 +81,9 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { } pub fn uu_app() -> Command { - Command::new(uucore::util_name()) + Command::new("paste") .version(uucore::crate_version!()) - .help_template(uucore::localized_help_template(uucore::util_name())) + .help_template(uucore::localized_help_template("paste")) .about(translate!("pathchk-about")) .override_usage(format_usage(&translate!("pathchk-usage"))) .infer_long_args(true) diff --git a/src/uu/pinky/src/pinky.rs b/src/uu/pinky/src/pinky.rs index 3ae07370a63..a0779799396 100644 --- a/src/uu/pinky/src/pinky.rs +++ b/src/uu/pinky/src/pinky.rs @@ -35,7 +35,7 @@ pub fn uu_app() -> Command { #[cfg(target_env = "musl")] let about = translate!("pinky-about") + &translate!("pinky-about-musl-warning"); - let cmd = Command::new(uucore::util_name()) + let cmd = Command::new("pinky") .version(uucore::crate_version!()) .about(about) .override_usage(format_usage(&translate!("pinky-usage"))) diff --git a/src/uu/pr/src/pr.rs b/src/uu/pr/src/pr.rs index 6048a5978f9..d74c65cc592 100644 --- a/src/uu/pr/src/pr.rs +++ b/src/uu/pr/src/pr.rs @@ -192,9 +192,9 @@ enum PrError { } pub fn uu_app() -> Command { - Command::new(uucore::util_name()) + Command::new("pr") .version(uucore::crate_version!()) - .help_template(uucore::localized_help_template(uucore::util_name())) + .help_template(uucore::localized_help_template("pr")) .about(translate!("pr-about")) .after_help(translate!("pr-after-help")) .override_usage(format_usage(&translate!("pr-usage"))) diff --git a/src/uu/printenv/src/printenv.rs b/src/uu/printenv/src/printenv.rs index e9f09f1d6e1..0005577c159 100644 --- a/src/uu/printenv/src/printenv.rs +++ b/src/uu/printenv/src/printenv.rs @@ -53,7 +53,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { } pub fn uu_app() -> Command { - let cmd = Command::new(uucore::util_name()) + let cmd = Command::new("printenv") .version(uucore::crate_version!()) .about(translate!("printenv-about")) .override_usage(format_usage(&translate!("printenv-usage"))) diff --git a/src/uu/printf/src/printf.rs b/src/uu/printf/src/printf.rs index 69be56c911d..699559a74db 100644 --- a/src/uu/printf/src/printf.rs +++ b/src/uu/printf/src/printf.rs @@ -82,10 +82,10 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { } pub fn uu_app() -> Command { - Command::new(uucore::util_name()) + Command::new("printf") .allow_hyphen_values(true) .version(uucore::crate_version!()) - .help_template(uucore::localized_help_template(uucore::util_name())) + .help_template(uucore::localized_help_template("printf")) .about(translate!("printf-about")) .after_help(translate!("printf-after-help")) .override_usage(format_usage(&translate!("printf-usage"))) diff --git a/src/uu/ptx/src/ptx.rs b/src/uu/ptx/src/ptx.rs index 1811a29bdc0..64a5e2bacbe 100644 --- a/src/uu/ptx/src/ptx.rs +++ b/src/uu/ptx/src/ptx.rs @@ -953,10 +953,10 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { } pub fn uu_app() -> Command { - Command::new(uucore::util_name()) + Command::new("ptx") .about(translate!("ptx-about")) .version(uucore::crate_version!()) - .help_template(uucore::localized_help_template(uucore::util_name())) + .help_template(uucore::localized_help_template("ptx")) .override_usage(format_usage(&translate!("ptx-usage"))) .infer_long_args(true) .arg( diff --git a/src/uu/pwd/src/pwd.rs b/src/uu/pwd/src/pwd.rs index b1670b06d0a..193af4ccc5f 100644 --- a/src/uu/pwd/src/pwd.rs +++ b/src/uu/pwd/src/pwd.rs @@ -139,9 +139,9 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { } pub fn uu_app() -> Command { - Command::new(uucore::util_name()) + Command::new("pwd") .version(uucore::crate_version!()) - .help_template(uucore::localized_help_template(uucore::util_name())) + .help_template(uucore::localized_help_template("pwd")) .about(translate!("pwd-about")) .override_usage(format_usage(&translate!("pwd-usage"))) .infer_long_args(true) diff --git a/src/uu/readlink/src/readlink.rs b/src/uu/readlink/src/readlink.rs index 4fc8eaa0e9c..89499cf388f 100644 --- a/src/uu/readlink/src/readlink.rs +++ b/src/uu/readlink/src/readlink.rs @@ -112,9 +112,9 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { } pub fn uu_app() -> Command { - Command::new(uucore::util_name()) + Command::new("readlink") .version(uucore::crate_version!()) - .help_template(uucore::localized_help_template(uucore::util_name())) + .help_template(uucore::localized_help_template("readlink")) .about(translate!("readlink-about")) .override_usage(format_usage(&translate!("readlink-usage"))) .infer_long_args(true) diff --git a/src/uu/realpath/src/realpath.rs b/src/uu/realpath/src/realpath.rs index 860e1361ec8..f8551e7fc55 100644 --- a/src/uu/realpath/src/realpath.rs +++ b/src/uu/realpath/src/realpath.rs @@ -126,9 +126,9 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { } pub fn uu_app() -> Command { - Command::new(uucore::util_name()) + Command::new("realpath") .version(uucore::crate_version!()) - .help_template(uucore::localized_help_template(uucore::util_name())) + .help_template(uucore::localized_help_template("realpath")) .about(translate!("realpath-about")) .override_usage(format_usage(&translate!("realpath-usage"))) .infer_long_args(true) diff --git a/src/uu/rm/src/rm.rs b/src/uu/rm/src/rm.rs index b1c7d1dedb8..5f2b981ea2b 100644 --- a/src/uu/rm/src/rm.rs +++ b/src/uu/rm/src/rm.rs @@ -294,7 +294,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { } pub fn uu_app() -> Command { - Command::new(uucore::util_name()) + Command::new("rm") .version(uucore::crate_version!()) .about(translate!("rm-about")) .help_template(uucore::localized_help_template(uucore::util_name())) diff --git a/src/uu/rmdir/src/rmdir.rs b/src/uu/rmdir/src/rmdir.rs index e0c9f73bcec..76fa126734a 100644 --- a/src/uu/rmdir/src/rmdir.rs +++ b/src/uu/rmdir/src/rmdir.rs @@ -15,7 +15,7 @@ use uucore::display::Quotable; use uucore::error::{UResult, set_exit_code, strip_errno}; use uucore::translate; -use uucore::{format_usage, show_error, util_name}; +use uucore::{format_usage, show_error}; static OPT_IGNORE_FAIL_NON_EMPTY: &str = "ignore-fail-on-non-empty"; static OPT_PARENTS: &str = "parents"; @@ -114,7 +114,7 @@ fn remove_single(path: &Path, opts: Opts) -> Result<(), Error<'_>> { if opts.verbose { println!( "{}", - translate!("rmdir-verbose-removing-directory", "util_name" => util_name(), "path" => path.quote()) + translate!("rmdir-verbose-removing-directory", "util_name" => "rmdir", "path" => path.quote()) ); } remove_dir(path).map_err(|error| Error { error, path }) @@ -178,9 +178,9 @@ struct Opts { } pub fn uu_app() -> Command { - Command::new(util_name()) + Command::new("rmdir") .version(uucore::crate_version!()) - .help_template(uucore::localized_help_template(util_name())) + .help_template(uucore::localized_help_template("rmdir")) .about(translate!("rmdir-about")) .override_usage(format_usage(&translate!("rmdir-usage"))) .infer_long_args(true) diff --git a/src/uu/runcon/src/runcon.rs b/src/uu/runcon/src/runcon.rs index 128d0dce370..1f6ab00dbd6 100644 --- a/src/uu/runcon/src/runcon.rs +++ b/src/uu/runcon/src/runcon.rs @@ -85,7 +85,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { } pub fn uu_app() -> Command { - let cmd = Command::new(uucore::util_name()) + let cmd = Command::new("runcon") .version(uucore::crate_version!()) .about(translate!("runcon-about")) .after_help(translate!("runcon-after-help")) diff --git a/src/uu/seq/src/seq.rs b/src/uu/seq/src/seq.rs index 0f32cf01f7c..3860f923bb4 100644 --- a/src/uu/seq/src/seq.rs +++ b/src/uu/seq/src/seq.rs @@ -228,7 +228,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { } pub fn uu_app() -> Command { - Command::new(uucore::util_name()) + Command::new("seq") .trailing_var_arg(true) .infer_long_args(true) .version(uucore::crate_version!()) diff --git a/src/uu/shred/src/shred.rs b/src/uu/shred/src/shred.rs index 7d19a42fc58..f35b1a0db2c 100644 --- a/src/uu/shred/src/shred.rs +++ b/src/uu/shred/src/shred.rs @@ -318,9 +318,9 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { } pub fn uu_app() -> Command { - Command::new(uucore::util_name()) + Command::new("shred") .version(uucore::crate_version!()) - .help_template(uucore::localized_help_template(uucore::util_name())) + .help_template(uucore::localized_help_template("shred")) .about(translate!("shred-about")) .after_help(translate!("shred-after-help")) .override_usage(format_usage(&translate!("shred-usage"))) diff --git a/src/uu/shuf/src/shuf.rs b/src/uu/shuf/src/shuf.rs index de725cc4e20..d3dd00a1905 100644 --- a/src/uu/shuf/src/shuf.rs +++ b/src/uu/shuf/src/shuf.rs @@ -172,10 +172,10 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { } pub fn uu_app() -> Command { - Command::new(uucore::util_name()) + Command::new("shuf") .about(translate!("shuf-about")) .version(uucore::crate_version!()) - .help_template(uucore::localized_help_template(uucore::util_name())) + .help_template(uucore::localized_help_template("shuf")) .override_usage(format_usage(&translate!("shuf-usage"))) .infer_long_args(true) .arg( diff --git a/src/uu/sleep/src/sleep.rs b/src/uu/sleep/src/sleep.rs index 5b1a1f510a0..cd82aa59185 100644 --- a/src/uu/sleep/src/sleep.rs +++ b/src/uu/sleep/src/sleep.rs @@ -37,9 +37,9 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { } pub fn uu_app() -> Command { - Command::new(uucore::util_name()) + Command::new("sleep") .version(uucore::crate_version!()) - .help_template(uucore::localized_help_template(uucore::util_name())) + .help_template(uucore::localized_help_template("sleep")) .about(translate!("sleep-about")) .after_help(translate!("sleep-after-help")) .override_usage(format_usage(&translate!("sleep-usage"))) diff --git a/src/uu/sort/src/sort.rs b/src/uu/sort/src/sort.rs index c87025a509d..29a1b100897 100644 --- a/src/uu/sort/src/sort.rs +++ b/src/uu/sort/src/sort.rs @@ -2340,7 +2340,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { pub fn uu_app() -> Command { uucore::clap_localization::configure_localized_command( - Command::new(uucore::util_name()) + Command::new("sort") .version(uucore::crate_version!()) .about(translate!("sort-about")) .after_help(translate!("sort-after-help")) diff --git a/src/uu/split/src/split.rs b/src/uu/split/src/split.rs index 923f66ac134..4a2e6bb9d95 100644 --- a/src/uu/split/src/split.rs +++ b/src/uu/split/src/split.rs @@ -234,7 +234,7 @@ fn handle_preceding_options( } pub fn uu_app() -> Command { - Command::new(uucore::util_name()) + Command::new("split") .version(uucore::crate_version!()) .help_template(uucore::localized_help_template(uucore::util_name())) .about(translate!("split-about")) diff --git a/src/uu/stat/src/stat.rs b/src/uu/stat/src/stat.rs index e91e0f3eb93..468f9ed6c23 100644 --- a/src/uu/stat/src/stat.rs +++ b/src/uu/stat/src/stat.rs @@ -1353,9 +1353,9 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { } pub fn uu_app() -> Command { - Command::new(uucore::util_name()) + Command::new("stat") .version(uucore::crate_version!()) - .help_template(uucore::localized_help_template(uucore::util_name())) + .help_template(uucore::localized_help_template("stat")) .about(translate!("stat-about")) .after_help(translate!("stat-after-help")) .override_usage(format_usage(&translate!("stat-usage"))) diff --git a/src/uu/stdbuf/src/stdbuf.rs b/src/uu/stdbuf/src/stdbuf.rs index 773b5ff9ccc..cbb2acb5838 100644 --- a/src/uu/stdbuf/src/stdbuf.rs +++ b/src/uu/stdbuf/src/stdbuf.rs @@ -259,9 +259,9 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { } pub fn uu_app() -> Command { - Command::new(uucore::util_name()) + Command::new("stdbuf") .version(uucore::crate_version!()) - .help_template(uucore::localized_help_template(uucore::util_name())) + .help_template(uucore::localized_help_template("stdbuf")) .about(translate!("stdbuf-about")) .after_help(translate!("stdbuf-after-help")) .override_usage(format_usage(&translate!("stdbuf-usage"))) diff --git a/src/uu/stty/src/stty.rs b/src/uu/stty/src/stty.rs index 6909d2c4f5f..686f00a823e 100644 --- a/src/uu/stty/src/stty.rs +++ b/src/uu/stty/src/stty.rs @@ -1253,9 +1253,9 @@ fn get_sane_control_char(cc_index: S) -> u8 { } pub fn uu_app() -> Command { - Command::new(uucore::util_name()) + Command::new("stty") .version(uucore::crate_version!()) - .help_template(uucore::localized_help_template(uucore::util_name())) + .help_template(uucore::localized_help_template("stty")) .override_usage(format_usage(&translate!("stty-usage"))) .about(translate!("stty-about")) .infer_long_args(true) diff --git a/src/uu/sync/src/sync.rs b/src/uu/sync/src/sync.rs index b91f216aaed..5ba42ebcdc2 100644 --- a/src/uu/sync/src/sync.rs +++ b/src/uu/sync/src/sync.rs @@ -272,9 +272,9 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { } pub fn uu_app() -> Command { - Command::new(uucore::util_name()) + Command::new("sync") .version(uucore::crate_version!()) - .help_template(uucore::localized_help_template(uucore::util_name())) + .help_template(uucore::localized_help_template("sync")) .about(translate!("sync-about")) .override_usage(format_usage(&translate!("sync-usage"))) .infer_long_args(true) diff --git a/src/uu/tac/src/tac.rs b/src/uu/tac/src/tac.rs index 88c355b0e4b..50e615c988b 100644 --- a/src/uu/tac/src/tac.rs +++ b/src/uu/tac/src/tac.rs @@ -56,9 +56,9 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { } pub fn uu_app() -> Command { - Command::new(uucore::util_name()) + Command::new("tac") .version(uucore::crate_version!()) - .help_template(uucore::localized_help_template(uucore::util_name())) + .help_template(uucore::localized_help_template("tac")) .override_usage(format_usage(&translate!("tac-usage"))) .about(translate!("tac-about")) .infer_long_args(true) diff --git a/src/uu/tail/src/args.rs b/src/uu/tail/src/args.rs index e1c1fe9aee1..b08ffe35f7b 100644 --- a/src/uu/tail/src/args.rs +++ b/src/uu/tail/src/args.rs @@ -448,9 +448,9 @@ pub fn uu_app() -> Command { #[cfg(target_os = "windows")] let polling_help = translate!("tail-help-polling-windows"); - Command::new(uucore::util_name()) + Command::new("tail") .version(uucore::crate_version!()) - .help_template(uucore::localized_help_template(uucore::util_name())) + .help_template(uucore::localized_help_template("tail")) .about(translate!("tail-about")) .override_usage(format_usage(&translate!("tail-usage"))) .infer_long_args(true) diff --git a/src/uu/tee/src/tee.rs b/src/uu/tee/src/tee.rs index 344286aa662..0863692814c 100644 --- a/src/uu/tee/src/tee.rs +++ b/src/uu/tee/src/tee.rs @@ -93,9 +93,9 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { } pub fn uu_app() -> Command { - Command::new(uucore::util_name()) + Command::new("tee") .version(uucore::crate_version!()) - .help_template(uucore::localized_help_template(uucore::util_name())) + .help_template(uucore::localized_help_template("tee")) .about(translate!("tee-about")) .override_usage(format_usage(&translate!("tee-usage"))) .after_help(translate!("tee-after-help")) diff --git a/src/uu/test/src/test.rs b/src/uu/test/src/test.rs index 92b1dcdde02..38c0072e15e 100644 --- a/src/uu/test/src/test.rs +++ b/src/uu/test/src/test.rs @@ -33,7 +33,8 @@ use uucore::translate; pub fn uu_app() -> Command { // Disable printing of -h and -v as valid alternatives for --help and --version, // since we don't recognize -h and -v as help/version flags. - Command::new(uucore::util_name()) + // We change the name to test later + Command::new("[") .version(uucore::crate_version!()) .help_template(uucore::localized_help_template(uucore::util_name())) .about(translate!("test-about")) @@ -64,8 +65,10 @@ pub fn uumain(mut args: impl uucore::Args) -> UResult<()> { translate!("test-error-missing-closing-bracket"), )); } + } else { + // Show actual name with error + let _ = uu_app().name("test"); } - let result = parse(args).map(|mut stack| eval(&mut stack))??; if result { Ok(()) } else { Err(1.into()) } diff --git a/src/uu/timeout/src/timeout.rs b/src/uu/timeout/src/timeout.rs index 6944794f19c..cd61d26c9fd 100644 --- a/src/uu/timeout/src/timeout.rs +++ b/src/uu/timeout/src/timeout.rs @@ -125,7 +125,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { pub fn uu_app() -> Command { Command::new("timeout") .version(uucore::crate_version!()) - .help_template(uucore::localized_help_template(uucore::util_name())) + .help_template(uucore::localized_help_template("timeout")) .about(translate!("timeout-about")) .override_usage(format_usage(&translate!("timeout-usage"))) .arg( diff --git a/src/uu/touch/src/touch.rs b/src/uu/touch/src/touch.rs index d1080c1dddf..887265dcb72 100644 --- a/src/uu/touch/src/touch.rs +++ b/src/uu/touch/src/touch.rs @@ -263,9 +263,9 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { } pub fn uu_app() -> Command { - Command::new(uucore::util_name()) + Command::new("touch") .version(uucore::crate_version!()) - .help_template(uucore::localized_help_template(uucore::util_name())) + .help_template(uucore::localized_help_template("touch")) .about(translate!("touch-about")) .override_usage(format_usage(&translate!("touch-usage"))) .infer_long_args(true) diff --git a/src/uu/tr/src/tr.rs b/src/uu/tr/src/tr.rs index 33f61d17fe6..58976d3ac06 100644 --- a/src/uu/tr/src/tr.rs +++ b/src/uu/tr/src/tr.rs @@ -148,9 +148,9 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { } pub fn uu_app() -> Command { - Command::new(uucore::util_name()) + Command::new("tr") .version(uucore::crate_version!()) - .help_template(uucore::localized_help_template(uucore::util_name())) + .help_template(uucore::localized_help_template("tr")) .about(translate!("tr-about")) .override_usage(format_usage(&translate!("tr-usage"))) .after_help(translate!("tr-after-help")) diff --git a/src/uu/truncate/src/truncate.rs b/src/uu/truncate/src/truncate.rs index 6f460cfd708..31a67f5f82a 100644 --- a/src/uu/truncate/src/truncate.rs +++ b/src/uu/truncate/src/truncate.rs @@ -124,7 +124,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { } pub fn uu_app() -> Command { - let cmd = Command::new(uucore::util_name()) + let cmd = Command::new("truncate") .version(uucore::crate_version!()) .about(translate!("truncate-about")) .override_usage(format_usage(&translate!("truncate-usage"))) diff --git a/src/uu/tsort/src/tsort.rs b/src/uu/tsort/src/tsort.rs index a689cd05be4..230bf2d6348 100644 --- a/src/uu/tsort/src/tsort.rs +++ b/src/uu/tsort/src/tsort.rs @@ -49,7 +49,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { translate!( "tsort-error-extra-operand", "operand" => extra.quote(), - "util" => uucore::util_name() + "util" => "tsort" ), )); } @@ -108,9 +108,9 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { } pub fn uu_app() -> Command { - Command::new(uucore::util_name()) + Command::new("tsort") .version(uucore::crate_version!()) - .help_template(uucore::localized_help_template(uucore::util_name())) + .help_template(uucore::localized_help_template("tsort")) .override_usage(format_usage(&translate!("tsort-usage"))) .about(translate!("tsort-about")) .infer_long_args(true) diff --git a/src/uu/tty/src/tty.rs b/src/uu/tty/src/tty.rs index cb5ae8e1721..89ecf34f9a9 100644 --- a/src/uu/tty/src/tty.rs +++ b/src/uu/tty/src/tty.rs @@ -58,7 +58,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { } pub fn uu_app() -> Command { - let cmd = Command::new(uucore::util_name()) + let cmd = Command::new("tty") .version(uucore::crate_version!()) .about(translate!("tty-about")) .override_usage(format_usage(&translate!("tty-usage"))) diff --git a/src/uu/uname/src/uname.rs b/src/uu/uname/src/uname.rs index f83ef0d12b3..1439bd6f7f2 100644 --- a/src/uu/uname/src/uname.rs +++ b/src/uu/uname/src/uname.rs @@ -141,9 +141,9 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { } pub fn uu_app() -> Command { - Command::new(uucore::util_name()) + Command::new("uname") .version(uucore::crate_version!()) - .help_template(uucore::localized_help_template(uucore::util_name())) + .help_template(uucore::localized_help_template("uname")) .about(translate!("uname-about")) .override_usage(format_usage(&translate!("uname-usage"))) .infer_long_args(true) diff --git a/src/uu/unexpand/src/unexpand.rs b/src/uu/unexpand/src/unexpand.rs index eae91164608..9c963f7aef3 100644 --- a/src/uu/unexpand/src/unexpand.rs +++ b/src/uu/unexpand/src/unexpand.rs @@ -235,7 +235,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { } pub fn uu_app() -> Command { - Command::new(uucore::util_name()) + Command::new("unexpand") .version(uucore::crate_version!()) .help_template(uucore::localized_help_template(uucore::util_name())) .override_usage(format_usage(&translate!("unexpand-usage"))) diff --git a/src/uu/uniq/src/uniq.rs b/src/uu/uniq/src/uniq.rs index 109e49d6224..e249aabe63c 100644 --- a/src/uu/uniq/src/uniq.rs +++ b/src/uu/uniq/src/uniq.rs @@ -655,7 +655,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { return Err(map_clap_errors(clap_error)); } // Use ErrorFormatter directly to handle error - let formatter = uucore::clap_localization::ErrorFormatter::new(uucore::util_name()); + let formatter = uucore::clap_localization::ErrorFormatter::new("uniq"); formatter.print_error_and_exit_with_callback(&clap_error, 1, || {}); } }; @@ -699,7 +699,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { } pub fn uu_app() -> Command { - let cmd = Command::new(uucore::util_name()) + let cmd = Command::new("uniq") .version(uucore::crate_version!()) .about(translate!("uniq-about")) .override_usage(format_usage(&translate!("uniq-usage"))) diff --git a/src/uu/unlink/src/unlink.rs b/src/uu/unlink/src/unlink.rs index caea413da51..188b6ad2d7f 100644 --- a/src/uu/unlink/src/unlink.rs +++ b/src/uu/unlink/src/unlink.rs @@ -27,9 +27,9 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { } pub fn uu_app() -> Command { - Command::new(uucore::util_name()) + Command::new("unlink") .version(uucore::crate_version!()) - .help_template(uucore::localized_help_template(uucore::util_name())) + .help_template(uucore::localized_help_template("unlink")) .about(translate!("unlink-about")) .override_usage(format_usage(&translate!("unlink-usage"))) .infer_long_args(true) diff --git a/src/uu/uptime/src/uptime.rs b/src/uu/uptime/src/uptime.rs index 71ffd980d66..36c8760fd70 100644 --- a/src/uu/uptime/src/uptime.rs +++ b/src/uu/uptime/src/uptime.rs @@ -74,9 +74,9 @@ pub fn uu_app() -> Command { #[cfg(target_env = "musl")] let about = translate!("uptime-about") + &translate!("uptime-about-musl-warning"); - let cmd = Command::new(uucore::util_name()) + let cmd = Command::new("uptime") .version(uucore::crate_version!()) - .help_template(uucore::localized_help_template(uucore::util_name())) + .help_template(uucore::localized_help_template("uptime")) .about(about) .override_usage(format_usage(&translate!("uptime-usage"))) .infer_long_args(true) diff --git a/src/uu/users/src/users.rs b/src/uu/users/src/users.rs index ea4b63d0d2a..5d78b17f9a7 100644 --- a/src/uu/users/src/users.rs +++ b/src/uu/users/src/users.rs @@ -86,9 +86,9 @@ pub fn uu_app() -> Command { #[cfg(target_env = "musl")] let about = translate!("users-about") + &translate!("users-about-musl-warning"); - Command::new(uucore::util_name()) + Command::new("users") .version(uucore::crate_version!()) - .help_template(uucore::localized_help_template(uucore::util_name())) + .help_template(uucore::localized_help_template("users")) .about(about) .override_usage(format_usage(&translate!("users-usage"))) .infer_long_args(true) diff --git a/src/uu/wc/src/wc.rs b/src/uu/wc/src/wc.rs index 0c09c2c3a43..35ca2c6d9f5 100644 --- a/src/uu/wc/src/wc.rs +++ b/src/uu/wc/src/wc.rs @@ -393,7 +393,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { } pub fn uu_app() -> Command { - Command::new(uucore::util_name()) + Command::new("wc") .version(uucore::crate_version!()) .help_template(uucore::localized_help_template(uucore::util_name())) .about(translate!("wc-about")) diff --git a/src/uu/who/src/who.rs b/src/uu/who/src/who.rs index 197fbe71287..e82990b7924 100644 --- a/src/uu/who/src/who.rs +++ b/src/uu/who/src/who.rs @@ -45,7 +45,7 @@ pub fn uu_app() -> Command { #[cfg(target_env = "musl")] let about = translate!("who-about") + &translate!("who-about-musl-warning"); - let cmd = Command::new(uucore::util_name()) + let cmd = Command::new("who") .version(uucore::crate_version!()) .about(about) .override_usage(format_usage(&translate!("who-usage"))) diff --git a/src/uu/whoami/src/whoami.rs b/src/uu/whoami/src/whoami.rs index 3851c10748d..17f50d1a62f 100644 --- a/src/uu/whoami/src/whoami.rs +++ b/src/uu/whoami/src/whoami.rs @@ -25,9 +25,9 @@ pub fn whoami() -> UResult { } pub fn uu_app() -> Command { - Command::new(uucore::util_name()) + Command::new("whoami") .version(uucore::crate_version!()) - .help_template(uucore::localized_help_template(uucore::util_name())) + .help_template(uucore::localized_help_template("whoami")) .about(translate!("whoami-about")) .override_usage(translate!("whoami-usage")) .infer_long_args(true) diff --git a/src/uu/yes/src/yes.rs b/src/uu/yes/src/yes.rs index 88d2c7ed113..96c9d43e18e 100644 --- a/src/uu/yes/src/yes.rs +++ b/src/uu/yes/src/yes.rs @@ -39,9 +39,9 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { } pub fn uu_app() -> Command { - Command::new(uucore::util_name()) + Command::new("yes") .version(uucore::crate_version!()) - .help_template(uucore::localized_help_template(uucore::util_name())) + .help_template(uucore::localized_help_template("yes")) .about(translate!("yes-about")) .override_usage(format_usage(&translate!("yes-usage"))) .arg(