fix: use XDG config directory for default config file location
Changes from manual HOME/.config/keep/config.yml construction to dirs::config_dir(), which respects XDG_CONFIG_HOME.
This commit is contained in:
@@ -232,15 +232,13 @@ impl Settings {
|
|||||||
} else if let Ok(env_config) = std::env::var("KEEP_CONFIG") {
|
} else if let Ok(env_config) = std::env::var("KEEP_CONFIG") {
|
||||||
PathBuf::from(env_config)
|
PathBuf::from(env_config)
|
||||||
} else {
|
} else {
|
||||||
let default_path = if let Ok(home_dir) = std::env::var("HOME") {
|
let default_path = dirs::config_dir()
|
||||||
let mut path = PathBuf::from(home_dir);
|
.map(|mut p| {
|
||||||
path.push(".config");
|
p.push("keep");
|
||||||
path.push("keep");
|
p.push("config.yml");
|
||||||
path.push("config.yml");
|
p
|
||||||
path
|
})
|
||||||
} else {
|
.unwrap_or_else(|| PathBuf::from("~/.config/keep/config.yml"));
|
||||||
PathBuf::from("~/.config/keep/config.yml")
|
|
||||||
};
|
|
||||||
debug!("CONFIG: Using default config path: {default_path:?}");
|
debug!("CONFIG: Using default config path: {default_path:?}");
|
||||||
default_path
|
default_path
|
||||||
};
|
};
|
||||||
|
|||||||
Reference in New Issue
Block a user