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

fix(path): change wrong package resolution order

Browse Source
This commit is contained in:
Federico Terzi 2021-06-02 11:48:58 +02:00
parent 2489f6c404
commit f98ab3dffd
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
espanso-path/src/lib.rs
View File

@ -234,15 +234,15 @@ fn get_default_runtime_path() -> PathBuf {
} }
fn get_packages_dir(config_dir: &Path, legacy_data_dir: &Path) -> Option<PathBuf> { fn get_packages_dir(config_dir: &Path, legacy_data_dir: &Path) -> Option<PathBuf> {
if let Some(packages_dir) = get_legacy_embedded_packages_dir(config_dir) { if let Some(packages_dir) = get_default_packages_dir(config_dir) {
debug!("detected default packages dir: {:?}", packages_dir);
Some(packages_dir)
} else if let Some(packages_dir) = get_legacy_embedded_packages_dir(config_dir) {
debug!("detected legacy packages dir: {:?}", packages_dir); debug!("detected legacy packages dir: {:?}", packages_dir);
Some(packages_dir) Some(packages_dir)
} else if let Some(packages_dir) = get_legacy_packages_dir(legacy_data_dir) { } else if let Some(packages_dir) = get_legacy_packages_dir(legacy_data_dir) {
debug!("detected legacy packages dir: {:?}", packages_dir); debug!("detected legacy packages dir: {:?}", packages_dir);
Some(packages_dir) Some(packages_dir)
} else if let Some(packages_dir) = get_default_packages_dir(config_dir) {
debug!("detected default packages dir: {:?}", packages_dir);
Some(packages_dir)
} else { } else {
None None
} }