diff --git a/src/data.rs b/src/data.rs index eda764f136e9898df906a199ec6e08d50314c105..dd9cfa22b0e3e50439c6edd7b36fd41f4a94a62e 100644 --- a/src/data.rs +++ b/src/data.rs @@ -239,7 +239,7 @@ fn load_layout_data_with_fallback( // Build the path to the right keyboard layout subdirectory //let mut variant_path = env::var_os("SQUEEKBOARD_KEYBOARDSDIR").unwrap(); - let mut directory: &str = ""; + let mut variant_prefix: &str = ""; let path = env::var_os("SQUEEKBOARD_KEYBOARDSDIR") .map(PathBuf::from) @@ -259,11 +259,11 @@ fn load_layout_data_with_fallback( // ::data::ContentPurpose::Date => env::var_os("SQUEEKBOARD_KEYBOARDSDIR").unwrap(), // ::data::ContentPurpose::Time => env::var_os("SQUEEKBOARD_KEYBOARDSDIR").unwrap(), // ::data::ContentPurpose::Datetime => env::var_os("SQUEEKBOARD_KEYBOARDSDIR").unwrap(), - ::data::ContentPurpose::Terminal => directory = "/terminal/", // terminal specific layouts - _ => directory = "", + ::data::ContentPurpose::Terminal => variant_prefix = "terminal_", // terminal specific layouts + _ => variant_prefix = "", } - let variant_name = format!("{}{}", directory, name); + let variant_name = format!("{}{}", variant_prefix, name); //variant_name.push_str(name); //let mut variant_path_buf = PathBuf::new();