From 8bc701934a3e85a573b85f2ff6e7bb464941971b Mon Sep 17 00:00:00 2001 From: Hatter Jiang Date: Sun, 21 Jul 2019 22:47:03 +0800 Subject: [PATCH] add get_home_path --- src/lib.rs | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/lib.rs b/src/lib.rs index a409474..93384e7 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -37,18 +37,22 @@ pub fn is_macos_or_linux() -> bool { is_macos() || is_linux() } -pub fn get_home() -> Option { +pub fn get_home_str() -> Option { match is_macos_or_linux() { true => env::var("HOME").ok(), false => None, } } +pub fn get_home_path() -> Option { + Some(PathBuf::from(get_home_str()?)) +} + pub fn get_absolute_path(path: &str) -> Option { if path == "~" { - return Some(PathBuf::from(get_home()?)); + return Some(PathBuf::from(get_home_str()?)); } else if path.starts_with("~/") { - return Some(PathBuf::from(&format!("{}/{}", get_home()?, &path[2..]))); + return Some(PathBuf::from(&format!("{}/{}", get_home_str()?, &path[2..]))); } fs::canonicalize(path).ok() }