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

Update determine_time_zone function to check TZ
ogham · Oct 8, 2020 · 8b852cb · 8b852cb
2 parents ba5547b + 5be0286
commit 8b852cb
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/src/output/table.rs b/src/output/table.rs
@@ -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")
+    }
 }