protect names against binary name

Author: oech3

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"))

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)

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),
         ))
     }
 }

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())
             );
         }
 

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")))

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)

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)

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")))

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)

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 {