From e88383d990cc8f5092e8513c91a17530dab0c444 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wojciech=20K=C4=99pka?= Date: Wed, 2 Jun 2021 12:25:25 +0200 Subject: [PATCH] Use config_dir for logging, create config_dir --- helix-term/src/main.rs | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/helix-term/src/main.rs b/helix-term/src/main.rs index e3304312d..3a0f4d204 100644 --- a/helix-term/src/main.rs +++ b/helix-term/src/main.rs @@ -8,6 +8,8 @@ use application::Application; +use helix_core::config_dir; + use std::path::PathBuf; use anyhow::{Context, Result}; @@ -27,8 +29,6 @@ fn setup_logging(verbosity: u64) -> Result<()> { _3_or_more => base_config.level(log::LevelFilter::Trace), }; - let home = dirs_next::home_dir().context("can't find the home directory")?; - // Separate file config so we can include year, month and day in file logs let file_config = fern::Dispatch::new() .format(|out, message, record| { @@ -40,7 +40,7 @@ fn setup_logging(verbosity: u64) -> Result<()> { message )) }) - .chain(fern::log_file(home.join("helix.log"))?); + .chain(fern::log_file(config_dir().join("helix.log"))?); base_config.chain(file_config).apply()?; @@ -89,6 +89,12 @@ fn main() -> Result<()> { verbosity = 1; } + let conf_dir = config_dir(); + + if !conf_dir.exists() { + std::fs::create_dir(&conf_dir); + } + setup_logging(verbosity).context("failed to initialize logging")?; let args = Args { @@ -96,7 +102,6 @@ fn main() -> Result<()> { }; // initialize language registry - use helix_core::config_dir; use helix_core::syntax::{Loader, LOADER}; // load $HOME/.config/helix/languages.toml, fallback to default config