diff --git a/src/uu/false/src/false.rs b/src/uu/false/src/false.rs index b304b4af6..0ebbb5be2 100644 --- a/src/uu/false/src/false.rs +++ b/src/uu/false/src/false.rs @@ -4,7 +4,7 @@ // * // * For the full copyright and license information, please view the LICENSE // * file that was distributed with this source code. -use clap::{App, AppSettings, ErrorKind}; +use clap::{App, Arg, ArgSettings, ErrorKind}; use std::io::Write; use uucore::error::{set_exit_code, UResult}; @@ -42,5 +42,16 @@ pub fn uu_app<'a>() -> App<'a> { App::new(uucore::util_name()) .version(clap::crate_version!()) .about(ABOUT) - .setting(AppSettings::InferLongArgs) + // Hide the default -V and -h for version and help. + // This requires us to overwrite short, not short_aliases. + .arg( + Arg::new("dummy-help") + .short('h') + .setting(ArgSettings::Hidden), + ) + .arg( + Arg::new("dummy-version") + .short('V') + .setting(ArgSettings::Hidden), + ) } diff --git a/src/uu/true/src/true.rs b/src/uu/true/src/true.rs index 21b064e73..20ee100b7 100644 --- a/src/uu/true/src/true.rs +++ b/src/uu/true/src/true.rs @@ -4,7 +4,7 @@ // * // * For the full copyright and license information, please view the LICENSE // * file that was distributed with this source code. -use clap::{App, AppSettings, ErrorKind}; +use clap::{App, Arg, ArgSettings, ErrorKind}; use std::io::Write; use uucore::error::{set_exit_code, UResult}; @@ -40,5 +40,16 @@ pub fn uu_app<'a>() -> App<'a> { App::new(uucore::util_name()) .version(clap::crate_version!()) .about(ABOUT) - .setting(AppSettings::InferLongArgs) + // Hide the default -V and -h for version and help. + // This requires us to overwrite short, not short_aliases. + .arg( + Arg::new("dummy-help") + .short('h') + .setting(ArgSettings::Hidden), + ) + .arg( + Arg::new("dummy-version") + .short('V') + .setting(ArgSettings::Hidden), + ) }