Llewellyn/exa
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/exa.git synced 2024-11-22 03:55:11 +00:00
Code Issues Projects Releases Wiki Activity

Update determine_time_zone according to GNU manual

Browse Source
This commit is contained in:
PatriotRossii 2021-03-24 17:36:13 +05:00
parent 13b91cced4
commit 57cf0f1b23
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/output/table.rs
View File

@ -292,9 +292,21 @@ impl Environment {
fn determine_time_zone() -> TZResult<TimeZone> {
if let Ok(file) = env::var("TZ") {
TimeZone::from_file(format!("/usr/share/zoneinfo/{}", file))
}
else {
TimeZone::from_file({
if file.starts_with("/") {
file
} else {
format!("/usr/share/zoneinfo/{}", {
if file.starts_with(":") {
// Unwrap is panic-free here because we've checked if file starts with colon
file.strip_prefix(":").unwrap()
} else {
file.as_str()
}
})
}
})
} else {
TimeZone::from_file("/etc/localtime")
}
}