From 43529bef94106f6513e80086b40d59a1001d4764 Mon Sep 17 00:00:00 2001 From: Daniel Hofstetter Date: Mon, 2 Feb 2026 16:31:27 +0100 Subject: [PATCH] Adapt to changes in uucore --- src/uu/hostname/hostname.md | 10 ---------- src/uu/hostname/src/hostname.rs | 14 ++++++++------ 2 files changed, 8 insertions(+), 16 deletions(-) delete mode 100644 src/uu/hostname/hostname.md diff --git a/src/uu/hostname/hostname.md b/src/uu/hostname/hostname.md deleted file mode 100644 index 9544161..0000000 --- a/src/uu/hostname/hostname.md +++ /dev/null @@ -1,10 +0,0 @@ -# hostname - -``` -hostname [-a|--alias|-d|--domain|-f|--fqdn|--long|-A|--all-fqdns|-i|--ip-address|-I|--all-ip-addresses|-s|--short|-y|--yp|--nis] -hostname [-b|--boot] {-F filename|--file filename|hostname} -hostname {-h|--help} -hostname {-V|--version} -``` - -show or set the system's host name diff --git a/src/uu/hostname/src/hostname.rs b/src/uu/hostname/src/hostname.rs index caf5f72..d34bb3c 100644 --- a/src/uu/hostname/src/hostname.rs +++ b/src/uu/hostname/src/hostname.rs @@ -13,10 +13,7 @@ use std::ffi::OsString; use std::path::PathBuf; use clap::{Arg, ArgAction, ArgGroup, Command, crate_version, value_parser}; -use uucore::{error::UResult, format_usage, help_about, help_usage}; - -const ABOUT: &str = help_about!("hostname.md"); -const USAGE: &str = help_usage!("hostname.md"); +use uucore::{error::UResult, format_usage}; pub mod options { pub static ALIAS: &str = "alias"; @@ -79,10 +76,15 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { #[must_use] pub fn uu_app() -> Command { + let usage = "hostname [-a|--alias|-d|--domain|-f|--fqdn|--long|-A|--all-fqdns|-i|--ip-address|-I|--all-ip-addresses|-s|--short|-y|--yp|--nis] +hostname [-b|--boot] {-F filename|--file filename|hostname} +hostname {-h|--help} +hostname {-V|--version}"; + Command::new(uucore::util_name()) .version(crate_version!()) - .about(ABOUT) - .override_usage(format_usage(USAGE)) + .about("Show or set the system's host name") + .override_usage(format_usage(usage)) .infer_long_args(true) .arg( Arg::new(options::ALIAS)