Search user dolphin-data directory for scripts

Source/Core/Common/CommonPaths.h

@@ -74,6 +74,7 @@
 #define ANAGLYPH_DIR        "Anaglyph"
 #define PIPES_DIR           "Pipes"
 #define MEMORYWATCHER_DIR   "MemoryWatcher"
+#define SCRIPTS_DIR         "Scripts"
 
 // This one is only used to remove it if it was present
 #define SHADERCACHE_LEGACY_DIR "ShaderCache"

Source/Core/Common/FileUtil.cpp

@@ -808,6 +808,7 @@ static void RebuildUserDirectories(unsigned int dir_index)
 		s_user_paths[F_GCSRAM_IDX]         = s_user_paths[D_GCUSER_IDX] + GC_SRAM;
 
 		s_user_paths[D_MEMORYWATCHER_IDX]          = s_user_paths[D_USER_IDX] + MEMORYWATCHER_DIR DIR_SEP;
+		s_user_paths[D_SCRIPTS_IDX]          = s_user_paths[D_USER_IDX] + SCRIPTS_DIR DIR_SEP;
 		s_user_paths[F_MEMORYWATCHERLOCATIONS_IDX] = s_user_paths[D_MEMORYWATCHER_IDX] + MEMORYWATCHER_LOCATIONS;
 		s_user_paths[F_MEMORYWATCHERSOCKET_IDX]    = s_user_paths[D_MEMORYWATCHER_IDX] + MEMORYWATCHER_SOCKET;
 

Source/Core/Common/FileUtil.h

@@ -43,6 +43,7 @@ enum {
 	D_THEMES_IDX,
 	D_PIPES_IDX,
 	D_MEMORYWATCHER_IDX,
+	D_SCRIPTS_IDX,
 	F_DOLPHINCONFIG_IDX,
 	F_DEBUGGERCONFIG_IDX,
 	F_LOGGERCONFIG_IDX,

Source/Core/Core/LUA/Lua.cpp

@@ -303,7 +303,7 @@ int GetGameID(lua_State* L)
 
 int GetScriptsDir(lua_State* L)
 {
-	lua_pushstring(L, (SYSDATA_DIR "/Scripts/"));
+	lua_pushstring(L, File::GetUserPath(D_SCRIPTS_IDX));
 	return 1;
 }
 
@@ -899,8 +899,7 @@ namespace Lua
 
 		//Auto launch Scripts that start with _
 
-
-	    std::vector<std::string> rFilenames = DoFileSearch({".lua"}, {SYSDATA_DIR "/Scripts"});
+	    std::vector<std::string> rFilenames = DoFileSearch({".lua"}, {File::GetUserPath(D_SCRIPTS_IDX)});
 
 		if (rFilenames.size() > 0)
 		{
@@ -1019,7 +1018,7 @@ namespace Lua
 				//Unique to normal Scripts
 				lua_register(it->luaState, "CancelScript", CancelScript);
 
-				std::string file = SYSDATA_DIR "/Scripts/" + it->fileName;
+				std::string file = File::GetUserPath(D_SCRIPTS_IDX) + it->fileName;
 
 				status = luaL_dofile(it->luaState, file.c_str());
 

Source/Core/DolphinWX/LaunchLuaScript.cpp

@@ -119,7 +119,7 @@ void LuaWindow::OnButtonPressed(wxCommandEvent& event)
 
 	if (event.GetId() == 2) //Start
 	{
-		if (File::Exists(SYSDATA_DIR "/Scripts/" + FileName) == false)
+		if (File::Exists(File::GetUserPath(D_SCRIPTS_IDX) + FileName) == false)
 		{
 			wxMessageBox("Script file does not exist anymore!");
 			return;
@@ -152,7 +152,7 @@ void LuaWindow::Shown()
 	m_choice_script->Clear();
 
 	//Find all Lua files
-	std::vector<std::string> rFilenames = DoFileSearch({".lua"}, {SYSDATA_DIR "/Scripts" });
+	std::vector<std::string> rFilenames = DoFileSearch({".lua"}, {File::GetUserPath(D_SCRIPTS_IDX)});
 
 	if (rFilenames.size() > 0)
 	{

Source/Core/UICommon/UICommon.cpp

@@ -49,6 +49,10 @@ void CreateDirectories()
 	File::CopyDir(File::GetSysDirectory() + WII_USER_DIR,
 				  File::GetUserPath(D_WIIROOT_IDX));
 
+	// Copy built-in scripts.
+	File::CopyDir(File::GetSysDirectory() + SCRIPTS_DIR,
+				  File::GetUserPath(D_SCRIPTS_IDX));
+
 	File::CreateFullPath(File::GetUserPath(D_USER_IDX));
 	File::CreateFullPath(File::GetUserPath(D_CACHE_IDX));
 	File::CreateFullPath(File::GetUserPath(D_CONFIG_IDX));