open.source/espanso
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: create packages directory in correct path

Browse Source
This commit is contained in:
Sefa Eyeoglu 2019-10-08 18:33:46 +02:00
parent fe1c3afa82
commit c0f4fe04ac
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/config/mod.rs
View File

@ -320,13 +320,13 @@ impl ConfigSet {
} }
pub fn load_default() -> Result<ConfigSet, ConfigLoadError> { pub fn load_default() -> Result<ConfigSet, ConfigLoadError> {
let espanso_dir = ConfigSet::get_default_config_dir(); let config_dir = ConfigSet::get_default_config_dir();
// Create the espanso dir if id doesn't exist // Create the espanso dir if it doesn't exist
let res = create_dir_all(espanso_dir.as_path()); let res = create_dir_all(config_dir.as_path());
if res.is_ok() { if res.is_ok() {
let default_file = espanso_dir.join(DEFAULT_CONFIG_FILE_NAME); let default_file = config_dir.join(DEFAULT_CONFIG_FILE_NAME);
// If config file does not exist, create one from template // If config file does not exist, create one from template
if !default_file.exists() { if !default_file.exists() {
@ -338,7 +338,7 @@ impl ConfigSet {
// Create auxiliary directories // Create auxiliary directories
let user_config_dir = espanso_dir.join(USER_CONFIGS_FOLDER_NAME); let user_config_dir = config_dir.join(USER_CONFIGS_FOLDER_NAME);
if !user_config_dir.exists() { if !user_config_dir.exists() {
let res = create_dir_all(user_config_dir.as_path()); let res = create_dir_all(user_config_dir.as_path());
if res.is_err() { if res.is_err() {
@ -346,7 +346,7 @@ impl ConfigSet {
} }
} }
let packages_dir = espanso_dir.join(PACKAGES_FOLDER_NAME); let packages_dir = ConfigSet::get_default_packages_dir().join(PACKAGES_FOLDER_NAME);
if !packages_dir.exists() { if !packages_dir.exists() {
let res = create_dir_all(packages_dir.as_path()); let res = create_dir_all(packages_dir.as_path());
if res.is_err() { if res.is_err() {
@ -354,7 +354,7 @@ impl ConfigSet {
} }
} }
return ConfigSet::load(espanso_dir.as_path()) return ConfigSet::load(config_dir.as_path())
} }
Err(ConfigLoadError::UnableToCreateDefaultConfig) Err(ConfigLoadError::UnableToCreateDefaultConfig)
@ -366,7 +366,7 @@ impl ConfigSet {
} }
pub fn get_default_packages_dir() -> PathBuf { pub fn get_default_packages_dir() -> PathBuf {
let data_dir = dirs::data_local_dir().expect("Unable to get data directory"); let data_dir = dirs::data_local_dir().expect("Unable to get package directory");
data_dir.join(PACKAGES_FOLDER_NAME) data_dir.join(PACKAGES_FOLDER_NAME)
} }
} }