Change the path of the Sys folder to the executable's location

lutris · Nov 7, 2015 · fe16f39 · fe16f39
1 parent 9731185
commit fe16f39
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 1 deletion.
diff --git a/Source/Core/Common/FileUtil.cpp b/Source/Core/Common/FileUtil.cpp
@@ -745,6 +745,23 @@ std::string& GetExeDirectory()
 	}
 	return DolphinPath;
 }
+#else
+std::string& GetExeDirectory()
+{
+	static std::string DolphinPath;
+	if (DolphinPath.empty())
+	{
+		char Dolphin_exe_Path[PATH_MAX];
+        ssize_t len = ::readlink("/proc/self/exe", Dolphin_exe_Path, sizeof(Dolphin_exe_Path));
+        if (len == -1 || len == sizeof(Dolphin_exe_Path)) {
+            len = 0;
+        }
+        Dolphin_exe_Path[len] = '\0';
+        DolphinPath = Dolphin_exe_Path;
+        DolphinPath = DolphinPath.substr(0, DolphinPath.find_last_of("/"));
+	}
+	return DolphinPath;
+}
 #endif
 
 std::string GetSysDirectory()
@@ -756,7 +773,8 @@ std::string GetSysDirectory()
 #elif defined (_WIN32)
 	sysDir = GetExeDirectory() + DIR_SEP + SYSDATA_DIR;
 #else
-	sysDir = SYSDATA_DIR;
+    // sysDir = SYSDATA_DIR;
+	sysDir = GetExeDirectory() + DIR_SEP + "Sys";
 #endif
 	sysDir += DIR_SEP;
 

diff --git a/Source/Core/Common/FileUtil.h b/Source/Core/Common/FileUtil.h
@@ -147,6 +147,8 @@ std::string GetBundleDirectory();
 
 #ifdef _WIN32
 std::string &GetExeDirectory();
+#else
+std::string &GetExeDirectory();
 #endif
 
 bool WriteStringToFile(const std::string& str, const std::string& filename);