Llewellyn/exa
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/exa.git synced 2024-12-27 02:12:53 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #725 from kbravh/tz-variable-patch

Browse Source 
Update determine_time_zone function to check TZ
This commit is contained in:
Benjamin Sago 2020-10-08 22:37:00 +01:00 committed by GitHub
commit 8b852cb201
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/output/table.rs
View File

@ -1,4 +1,5 @@
use std::cmp::max;
use std::env;
use std::fmt;
use std::ops::Deref;
use std::sync::{Mutex, MutexGuard};
@ -291,7 +292,11 @@ impl Environment {
}
fn determine_time_zone() -> TZResult<TimeZone> {
TimeZone::from_file("/etc/localtime")
if let Ok(file) = env::var("TZ") {
TimeZone::from_file(format!("/usr/share/zoneinfo/{}", file))
} else {
TimeZone::from_file("/etc/localtime")
}
}