diff --git a/src/uu/dircolors/src/dircolors.rs b/src/uu/dircolors/src/dircolors.rs index cc3a9baa6..2c31d727e 100644 --- a/src/uu/dircolors/src/dircolors.rs +++ b/src/uu/dircolors/src/dircolors.rs @@ -166,6 +166,7 @@ pub fn uu_app<'a>() -> Command<'a> { .long("sh") .short('b') .visible_alias("bourne-shell") + .overrides_with(options::C_SHELL) .help("output Bourne shell code to set LS_COLORS") .display_order(1), ) @@ -174,6 +175,7 @@ pub fn uu_app<'a>() -> Command<'a> { .long("csh") .short('c') .visible_alias("c-shell") + .overrides_with(options::BOURNE_SHELL) .help("output C shell code to set LS_COLORS") .display_order(2), ) diff --git a/src/uu/dirname/src/dirname.rs b/src/uu/dirname/src/dirname.rs index ac37e513b..d2620315f 100644 --- a/src/uu/dirname/src/dirname.rs +++ b/src/uu/dirname/src/dirname.rs @@ -21,7 +21,7 @@ mod options { fn get_long_usage() -> String { String::from( - "Output each NAME with its last non-slash component and trailing slashes + "Output each NAME with its last non-slash component and trailing slashes \n\ removed; if NAME contains no /'s, output '.' (meaning the current directory).", ) } diff --git a/src/uu/tail/src/tail.rs b/src/uu/tail/src/tail.rs index 7002cce1e..2d22ef54e 100644 --- a/src/uu/tail/src/tail.rs +++ b/src/uu/tail/src/tail.rs @@ -573,7 +573,7 @@ pub fn uu_app<'a>() -> Command<'a> { .short('s') .takes_value(true) .long(options::SLEEP_INT) - .help("Number or seconds to sleep between polling the file when running with -f"), + .help("Number of seconds to sleep between polling the file when running with -f"), ) .arg( Arg::new(options::MAX_UNCHANGED_STATS) diff --git a/tests/by-util/test_dircolors.rs b/tests/by-util/test_dircolors.rs index edbc83bbb..bb64fd1e5 100644 --- a/tests/by-util/test_dircolors.rs +++ b/tests/by-util/test_dircolors.rs @@ -1,3 +1,4 @@ +// spell-checker:ignore overridable use crate::common::util::*; extern crate dircolors; @@ -78,6 +79,19 @@ fn test_csh_default() { .run() .stdout_is_fixture("csh_def.expected"); } +#[test] +fn test_overridable_args() { + new_ucmd!() + .env("TERM", "screen") + .arg("-bc") + .run() + .stdout_is_fixture("csh_def.expected"); + new_ucmd!() + .env("TERM", "screen") + .arg("-cb") + .run() + .stdout_is_fixture("bash_def.expected"); +} #[test] fn test_no_env() {