From ee05b0c8ef19b61146ef26c18bbf2f377cc90a96 Mon Sep 17 00:00:00 2001
From: M33 <327-m33@git.qoto.org>
Date: Tue, 16 Mar 2021 18:50:18 +0000
Subject: [PATCH] Update src/data.rs

---
 src/data.rs | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/data.rs b/src/data.rs
index 9ea7be4c..d5bb3e7a 100644
--- a/src/data.rs
+++ b/src/data.rs
@@ -235,17 +235,16 @@ fn load_layout_data_with_fallback(
     kind: ArrangementKind,
     variant: ContentPurpose,
 ) -> (ArrangementKind, ::layout::LayoutData) {
+    
     // Build the path to the right keyboard layout subdirectory
-    let mut keyboard_dir="squeekboard".to_string(); // base dir
-
+    let mut path = env::var_os("SQUEEKBOARD_KEYBOARDSDIR")
+        .map(PathBuf::from)
+        .or_else(|| xdg::data_path("squeekboard/keyboards"));
+    
     match variant {
-        ::data::ContentPurpose::Terminal => keyboard_dir.push_str("/keyboards/terminal"), // terminal specific layouts
-        _ => keyboard_dir.push_str("/keyboards/Terminal"), // base, wide + aliens 
+        ::data::ContentPurpose::Terminal => path.push_str("/terminal"), // terminal specific layouts
     }
 
-    let path = env::var_os("SQUEEKBOARD_KEYBOARDSDIR")
-        .map(PathBuf::from)
-        .or_else(|| xdg::data_path(keyboard_dir));
     
     for (kind, source) in list_layout_sources(name, kind, path) {
         let layout = load_layout_data(source.clone());
-- 
GitLab