From cf6f9a700d06ce63e338855c658b94c7ecd074a0 Mon Sep 17 00:00:00 2001 From: Akhil Mohan Date: Sun, 5 Mar 2023 19:22:50 +0530 Subject: [PATCH] replace VERSION string with clap::crate_version replace VERSION string with clap::crate_version in chcon, chgrp and runcon utilities Signed-off-by: Akhil Mohan --- src/uu/chcon/src/chcon.rs | 5 ++--- src/uu/chgrp/src/chgrp.rs | 5 ++--- src/uu/runcon/src/runcon.rs | 5 ++--- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/src/uu/chcon/src/chcon.rs b/src/uu/chcon/src/chcon.rs index 2f316393a..63ae3abea 100644 --- a/src/uu/chcon/src/chcon.rs +++ b/src/uu/chcon/src/chcon.rs @@ -5,7 +5,7 @@ use clap::builder::ValueParser; use uucore::error::{UResult, USimpleError, UUsageError}; use uucore::{display::Quotable, format_usage, help_about, help_usage, show_error, show_warning}; -use clap::{Arg, ArgAction, Command}; +use clap::{crate_version, Arg, ArgAction, Command}; use selinux::{OpaqueSecurityContext, SecurityContext}; use std::borrow::Cow; @@ -19,7 +19,6 @@ mod fts; use errors::*; -const VERSION: &str = env!("CARGO_PKG_VERSION"); const ABOUT: &str = help_about!("chcon.md"); const USAGE: &str = help_usage!("chcon.md"); @@ -146,7 +145,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { pub fn uu_app() -> Command { Command::new(uucore::util_name()) - .version(VERSION) + .version(crate_version!()) .about(ABOUT) .override_usage(format_usage(USAGE)) .infer_long_args(true) diff --git a/src/uu/chgrp/src/chgrp.rs b/src/uu/chgrp/src/chgrp.rs index dcbb82798..15a248ddf 100644 --- a/src/uu/chgrp/src/chgrp.rs +++ b/src/uu/chgrp/src/chgrp.rs @@ -13,12 +13,11 @@ use uucore::error::{FromIo, UResult, USimpleError}; use uucore::perms::{chown_base, options, IfFrom}; use uucore::{format_usage, help_about, help_usage}; -use clap::{Arg, ArgAction, ArgMatches, Command}; +use clap::{crate_version, Arg, ArgAction, ArgMatches, Command}; use std::fs; use std::os::unix::fs::MetadataExt; -static VERSION: &str = env!("CARGO_PKG_VERSION"); static ABOUT: &str = help_about!("chgrp.md"); const USAGE: &str = help_usage!("chgrp.md"); @@ -56,7 +55,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { pub fn uu_app() -> Command { Command::new(uucore::util_name()) - .version(VERSION) + .version(crate_version!()) .about(ABOUT) .override_usage(format_usage(USAGE)) .infer_long_args(true) diff --git a/src/uu/runcon/src/runcon.rs b/src/uu/runcon/src/runcon.rs index 365038907..4ee3c6eba 100644 --- a/src/uu/runcon/src/runcon.rs +++ b/src/uu/runcon/src/runcon.rs @@ -3,7 +3,7 @@ use clap::builder::ValueParser; use uucore::error::{UResult, UUsageError}; -use clap::{Arg, ArgAction, Command}; +use clap::{crate_version, Arg, ArgAction, Command}; use selinux::{OpaqueSecurityContext, SecurityClass, SecurityContext}; use uucore::format_usage; @@ -18,7 +18,6 @@ mod errors; use errors::error_exit_status; use errors::{Error, Result, RunconError}; -const VERSION: &str = env!("CARGO_PKG_VERSION"); const ABOUT: &str = "Run command with specified security context."; const USAGE: &str = "\ {} [CONTEXT COMMAND [ARG...]] @@ -107,7 +106,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { pub fn uu_app() -> Command { Command::new(uucore::util_name()) - .version(VERSION) + .version(crate_version!()) .about(ABOUT) .after_help(DESCRIPTION) .override_usage(format_usage(USAGE))