commit b5a20a8d00ce45ad6fe21ffba03f8d4ffa37a44c
author bigbiff <bigbiff@teamw.in> Sun Oct 17 20:02:17 2021 -0400
committer bigbiff <bigbiff@teamw.in> Sat Oct 23 14:27:55 2021 -0400
tree 3069e2ba27d7221d0acff98079065e51c6f98644
parent b9655640f7f386969bbcf05362147d850557c18b

apex: cleanup apex directory bind mount names

Change-Id: Ia120ed12f3ae551044907dfd1fd05444be78d18c

twrpApex.cpp

diff --git a/twrpApex.cpp b/twrpApex.cpp
index ca6cff4..22da17a 100755
--- a/twrpApex.cpp
+++ b/twrpApex.cpp
@@ -169,7 +169,10 @@
 	close(loop_fd);
 
 	std::string bind_mount(APEX_BASE);
-	bind_mount = bind_mount + basename(fileToMount.c_str());
+	std::string apex_cleaned_mount = fileToMount;
+	apex_cleaned_mount = std::regex_replace(apex_cleaned_mount, std::regex("\\.apex"), "");
+
+	bind_mount = bind_mount + basename(apex_cleaned_mount.c_str());
 
 	int ret = mkdir(bind_mount.c_str(), 0666);
 	if (ret != 0) {

twrpApex.hpp

diff --git a/twrpApex.hpp b/twrpApex.hpp
index d03df10..b3809dd 100755
--- a/twrpApex.hpp
+++ b/twrpApex.hpp
@@ -5,6 +5,7 @@
 #include <string>
 #include <vector>
 #include <filesystem>
+#include <regex>
 #include <sstream>
 
 #include <sys/types.h>