pogmommy/makima
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Check HOME instead of USER to determine cfg dir

Browse source
This commit is contained in:
cyber-sushi 2024-05-08 17:54:26 +02:00
parent ebfa3a4944
commit 2c9cd872df
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/main.rs
View file

@ -13,17 +13,17 @@ use crate::udev_monitor::*;
#[tokio::main] #[tokio::main]
async fn main() { async fn main() {
let user = match env::var("USER") { let user_home = match env::var("HOME") {
Ok(user) if user == "root".to_string() => { Ok(user_home) if user_home == "/root".to_string() => {
match env::var("SUDO_USER") { match env::var("SUDO_USER") {
Ok(sudo_user) => format!("/home/{}", 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(), _ => "/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") { let config_path = match env::var("MAKIMA_CONFIG") {
Ok(path) => { Ok(path) => {
println!("\nMAKIMA_CONFIG set to {:?}.", path); println!("\nMAKIMA_CONFIG set to {:?}.", path);