MTSR/minetest
3
0
Fork 0
mirror of https://github.com/minetest/minetest.git synced 2024-09-20 07:20:46 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix mods folder being read twice with RUN_IN_PLACE=1 (#15024)

Browse Source
This commit is contained in:
grorp 2024-08-21 20:25:58 +02:00 committed by GitHub
parent b2f6a65bc9
commit 66b3db3601
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/menu_lua_api.md
View File

@ -282,7 +282,7 @@ Package - content which is downloadable from the content db, may or may not be i
```lua ```lua
{ {
mods = "/home/user/.minetest/mods", mods = "/home/user/.minetest/mods",
share = "/usr/share/minetest/mods", share = "/usr/share/minetest/mods", -- only provided when RUN_IN_PLACE=0
-- Custom dirs can be specified by the MINETEST_MOD_DIR env variable -- Custom dirs can be specified by the MINETEST_MOD_DIR env variable
["/path/to/custom/dir"] = "/path/to/custom/dir", ["/path/to/custom/dir"] = "/path/to/custom/dir",

2
src/script/lua_api/l_mainmenu.cpp
View File

@ -675,10 +675,12 @@ int ModApiMainMenu::l_get_modpaths(lua_State *L)
ModApiMainMenu::l_get_modpath(L); ModApiMainMenu::l_get_modpath(L);
lua_setfield(L, -2, "mods"); lua_setfield(L, -2, "mods");
if (porting::path_share != porting::path_user) {
std::string modpath = fs::RemoveRelativePathComponents( std::string modpath = fs::RemoveRelativePathComponents(
porting::path_share + DIR_DELIM + "mods" + DIR_DELIM); porting::path_share + DIR_DELIM + "mods" + DIR_DELIM);
lua_pushstring(L, modpath.c_str()); lua_pushstring(L, modpath.c_str());
lua_setfield(L, -2, "share"); lua_setfield(L, -2, "share");
}
for (const std::string &component : getEnvModPaths()) { for (const std::string &component : getEnvModPaths()) {
lua_pushstring(L, component.c_str()); lua_pushstring(L, component.c_str());