From d45025f0d2bd5bd65805be86da285f599310a51e Mon Sep 17 00:00:00 2001 From: cyber-sushi Date: Thu, 9 May 2024 02:03:28 +0200 Subject: [PATCH] If MAKIMA_CONFIG is set, don't bother locating the default config directory --- src/main.rs | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/main.rs b/src/main.rs index 6e9b750..50fdbb7 100644 --- a/src/main.rs +++ b/src/main.rs @@ -13,17 +13,6 @@ use crate::udev_monitor::*; #[tokio::main] async fn main() { - 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), - _ => user_home, - } - }, - Ok(user_home) => format!("/home/{}", user_home), - _ => "/root".to_string(), - }; - 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); @@ -36,6 +25,17 @@ async fn main() { } }, Err(_) => { + 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), + _ => user_home, + } + }, + Ok(user_home) => format!("/home/{}", user_home), + _ => "/root".to_string(), + }; + let default_config_path = format!("{}/.config/makima", user_home); println!("\nMAKIMA_CONFIG environment variable is not set, defaulting to {:?}.", default_config_path); match std::fs::read_dir(default_config_path) { Ok(dir) => dir,