diff --git a/src/data.rs b/src/data.rs index 2f962547f30dd0dab424fa059f2380be4145c767..6850d4712f68a5bb5e56d4b2fb13bd8f68c5e645 100644 --- a/src/data.rs +++ b/src/data.rs @@ -237,18 +237,18 @@ fn load_layout_data_with_fallback( ) -> (ArrangementKind, ::layout::LayoutData) { // Build the path to the right keyboard layout subdirectory - let mut path = env::var_os("SQUEEKBOARD_KEYBOARDSDIR") - .map(PathBuf::from) - .or_else(|| xdg::data_path("squeekboard/keyboards")); + let mut variant_path = env::var_os("SQUEEKBOARD_KEYBOARDSDIR").unwrap(); + + //let mut path = env::var_os("SQUEEKBOARD_KEYBOARDSDIR") + // .map(PathBuf::from) + // .or_else(|| xdg::data_path("squeekboard/keyboards")); - //let mut variant_path = PathBuf::new(); - //variant_path.push(path); match variant { - ::data::ContentPurpose::Terminal => path.join("/terminal"), // terminal specific layouts + ::data::ContentPurpose::Terminal => variant_path.push("/terminal"), // terminal specific layouts } //let full_path=PathBuf::from(variant_path);serde::export::Some(full_path) - for (kind, source) in list_layout_sources(name, kind, path) { + for (kind, source) in list_layout_sources(name, kind, variant_path.map(PathBuf::from)) { let layout = load_layout_data(source.clone()); match layout { Err(e) => match (e, source) {