Mirrors/coreutils
2
0
Fork 0
mirror of https://github.com/uutils/coreutils synced 2025-01-19 00:24:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

touch: rename CURRENT to TIMESTAMP

Browse source
This commit is contained in:
Daniel Hofstetter 2023-06-20 15:23:54 +02:00
parent 66723e0961
commit e990f87edc
1 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/uu/touch/src/touch.rs
View file

@ -29,7 +29,7 @@ pub mod options {
pub mod sources { pub mod sources {
pub static DATE: &str = "date"; pub static DATE: &str = "date";
pub static REFERENCE: &str = "reference"; pub static REFERENCE: &str = "reference";
pub static CURRENT: &str = "current"; pub static TIMESTAMP: &str = "timestamp";
} }
pub static HELP: &str = "help"; pub static HELP: &str = "help";
pub static ACCESS: &str = "access"; pub static ACCESS: &str = "access";
@ -120,12 +120,12 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> {
(timestamp, timestamp) (timestamp, timestamp)
} }
(None, None) => { (None, None) => {
let timestamp = let timestamp = if let Some(ts) = matches.get_one::<String>(options::sources::TIMESTAMP)
if let Some(current) = matches.get_one::<String>(options::sources::CURRENT) { {
parse_timestamp(current)? parse_timestamp(ts)?
} else { } else {
local_dt_to_filetime(time::OffsetDateTime::now_local().unwrap()) local_dt_to_filetime(time::OffsetDateTime::now_local().unwrap())
}; };
(timestamp, timestamp) (timestamp, timestamp)
} }
}; };
@ -243,7 +243,7 @@ pub fn uu_app() -> Command {
.action(ArgAction::SetTrue), .action(ArgAction::SetTrue),
) )
.arg( .arg(
Arg::new(options::sources::CURRENT) Arg::new(options::sources::TIMESTAMP)
.short('t') .short('t')
.help("use [[CC]YY]MMDDhhmm[.ss] instead of the current time") .help("use [[CC]YY]MMDDhhmm[.ss] instead of the current time")
.value_name("STAMP"), .value_name("STAMP"),
@ -255,7 +255,7 @@ pub fn uu_app() -> Command {
.allow_hyphen_values(true) .allow_hyphen_values(true)
.help("parse argument and use it instead of current time") .help("parse argument and use it instead of current time")
.value_name("STRING") .value_name("STRING")
.conflicts_with(options::sources::CURRENT), .conflicts_with(options::sources::TIMESTAMP),
) )
.arg( .arg(
Arg::new(options::MODIFICATION) Arg::new(options::MODIFICATION)
@ -288,7 +288,7 @@ pub fn uu_app() -> Command {
.value_name("FILE") .value_name("FILE")
.value_parser(ValueParser::os_string()) .value_parser(ValueParser::os_string())
.value_hint(clap::ValueHint::AnyPath) .value_hint(clap::ValueHint::AnyPath)
.conflicts_with(options::sources::CURRENT), .conflicts_with(options::sources::TIMESTAMP),
) )
.arg( .arg(
Arg::new(options::TIME) Arg::new(options::TIME)
@ -311,7 +311,7 @@ pub fn uu_app() -> Command {
.group( .group(
ArgGroup::new(options::SOURCES) ArgGroup::new(options::SOURCES)
.args([ .args([
options::sources::CURRENT, options::sources::TIMESTAMP,
options::sources::DATE, options::sources::DATE,
options::sources::REFERENCE, options::sources::REFERENCE,
]) ])