myriation/atuin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Don't create config dir for server in default location if not needed (#406)

Browse source 
...respect ATUIN_CONFIG_DIR.

The current behaviour is problematic when running atuin server as a
system service with config dir in /etc/atuin.
This commit is contained in:
Jakub Jirutka 2022-05-13 07:07:46 +02:00 committed by GitHub
parent b7946cc9cb
commit 5e4e8d1152
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
atuin-server/src/settings.rs
View file

@ -17,15 +17,11 @@ pub struct Settings {
impl Settings { impl Settings {
pub fn new() -> Result<Self> { pub fn new() -> Result<Self> {
let config_dir = atuin_common::utils::config_dir();
let config_dir = config_dir.as_path();
create_dir_all(config_dir)?;
let mut config_file = if let Ok(p) = std::env::var("ATUIN_CONFIG_DIR") { let mut config_file = if let Ok(p) = std::env::var("ATUIN_CONFIG_DIR") {
PathBuf::from(p) PathBuf::from(p)
} else { } else {
let mut config_file = PathBuf::new(); let mut config_file = PathBuf::new();
let config_dir = atuin_common::utils::config_dir();
config_file.push(config_dir); config_file.push(config_dir);
config_file config_file
}; };
@ -50,6 +46,7 @@ impl Settings {
)) ))
} else { } else {
let example_config = include_bytes!("../server.toml"); let example_config = include_bytes!("../server.toml");
create_dir_all(config_file.parent().unwrap())?;
let mut file = File::create(config_file)?; let mut file = File::create(config_file)?;
file.write_all(example_config)?; file.write_all(example_config)?;