change method weasel_shared_data_dir

rime · Jan 19, 2024 · 21c10cc · 21c10cc
1 parent b841385
commit 21c10cc
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/RimeWithWeasel/WeaselUtility.cpp b/RimeWithWeasel/WeaselUtility.cpp
@@ -28,11 +28,7 @@ const char* weasel_shared_data_dir() {
 	GetModuleFileNameA(NULL, path, _countof(path));
 	std::string str_path(path);
 	size_t k = str_path.find_last_of("/\\");
-#ifdef _WIN64
-		strcpy_s(path + k - 3 , _countof(path) - (k + 3), "data");
-#else
-		strcpy_s(path + k + 1, _countof(path) - (k + 1), "data");
-#endif
+	strcpy_s(path + k + 1, _countof(path) - (k + 1), "data");
 	return path;
 }
 

diff --git a/WeaselDeployer/Configurator.cpp b/WeaselDeployer/Configurator.cpp
@@ -14,6 +14,7 @@
 #include <rime_levers_api.h>
 #pragma warning(default: 4005)
 #include <fstream>
+#include <regex>
 #include "WeaselDeployer.h"
 
 static void CreateFileIfNotExist(std::string filename)
@@ -35,7 +36,11 @@ Configurator::Configurator()
 void Configurator::Initialize()
 {
 	RIME_STRUCT(RimeTraits, weasel_traits);
-	weasel_traits.shared_data_dir = weasel_shared_data_dir();
+	std::string shared_data_dir = weasel_shared_data_dir();
+#ifdef _WIN64
+	shared_data_dir = std::regex_replace(shared_data_dir, std::regex("\\\\x64"), "");
+#endif
+	weasel_traits.shared_data_dir = shared_data_dir.c_str();
 	weasel_traits.user_data_dir = weasel_user_data_dir();
 	weasel_traits.prebuilt_data_dir = weasel_traits.shared_data_dir;
 	const int len = 20;