From 2c9cd872df8c9d6856134fd56d0cb295e5b8327b Mon Sep 17 00:00:00 2001 From: cyber-sushi Date: Wed, 8 May 2024 17:54:26 +0200 Subject: [PATCH] Check HOME instead of USER to determine cfg dir --- src/main.rs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main.rs b/src/main.rs index 3fd2313..6e9b750 100644 --- a/src/main.rs +++ b/src/main.rs @@ -13,17 +13,17 @@ use crate::udev_monitor::*; #[tokio::main] async fn main() { - let user = match env::var("USER") { - Ok(user) if user == "root".to_string() => { + let user_home = match env::var("HOME") { + Ok(user_home) if user_home == "/root".to_string() => { match env::var("SUDO_USER") { Ok(sudo_user) => format!("/home/{}", sudo_user), - _ => format!("/{}", user), + _ => user_home, } }, - Ok(user) => format!("/home/{}", user), + Ok(user_home) => format!("/home/{}", user_home), _ => "/root".to_string(), }; - let default_config_path = format!("{}/.config/makima", user); + let default_config_path = format!("{}/.config/makima", user_home); let config_path = match env::var("MAKIMA_CONFIG") { Ok(path) => { println!("\nMAKIMA_CONFIG set to {:?}.", path);