From 43b079017d993ac959cfc37dea4d076cc7e17cb5 Mon Sep 17 00:00:00 2001 From: Federico Terzi Date: Sat, 19 Oct 2019 21:52:42 +0200 Subject: [PATCH] Include support for $HOME/.config/espanso directory location. Fix #88 --- src/context/mod.rs | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/context/mod.rs b/src/context/mod.rs index bb60478..782538f 100644 --- a/src/context/mod.rs +++ b/src/context/mod.rs @@ -93,6 +93,13 @@ pub fn get_config_dir() -> PathBuf { return legacy_espanso_dir; } + // Check for $HOME/.config/espanso location + let home_config_dir = home_dir.join(".config"); + let config_espanso_dir = home_config_dir.join("espanso"); + if config_espanso_dir.exists() { + return config_espanso_dir; + } + // New config location, from version v0.3.0 // Refer to issue #73 for more information: https://github.com/federico-terzi/espanso/issues/73 let config_dir = dirs::config_dir().expect("Can't obtain config_dir(), terminating.");