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

If MAKIMA_CONFIG is set, don't bother locating the default config directory

Browse source
This commit is contained in:
cyber-sushi 2024-05-09 02:03:28 +02:00
parent a78978536b
commit d45025f0d2
1 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/main.rs
View file

@ -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,