diff options
| author | rubenwardy <rw@rubenwardy.com> | 2019-01-06 09:23:35 +0000 |
|---|---|---|
| committer | Loïc Blot <nerzhul@users.noreply.github.com> | 2019-01-06 10:23:35 +0100 |
| commit | 70bf3439ab9f3cb826d76111552dcc38678fcf3d (patch) | |
| tree | 1c56f6667e84b3f979c0b1bfcbc18db7cfbf2cc7 /builtin/mainmenu/dlg_contentstore.lua | |
| parent | 3a9fe2bd5b0c112150eb20e375729aea7a4776f4 (diff) | |
| download | minetest-70bf3439ab9f3cb826d76111552dcc38678fcf3d.tar.gz minetest-70bf3439ab9f3cb826d76111552dcc38678fcf3d.tar.bz2 minetest-70bf3439ab9f3cb826d76111552dcc38678fcf3d.zip | |
Deprecate modpack.txt and use modpack.conf instead (#7892)
* Deprecate modpack.txt and use modpack.conf instead
Diffstat (limited to 'builtin/mainmenu/dlg_contentstore.lua')
| -rw-r--r-- | builtin/mainmenu/dlg_contentstore.lua | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/builtin/mainmenu/dlg_contentstore.lua b/builtin/mainmenu/dlg_contentstore.lua index bab2c73f3..414c26853 100644 --- a/builtin/mainmenu/dlg_contentstore.lua +++ b/builtin/mainmenu/dlg_contentstore.lua @@ -76,10 +76,17 @@ local function start_install(calling_dialog, package) if not path then gamedata.errormessage = msg else + core.log("action", "Installed package to " .. path) + local conf_path local name_is_title = false if result.package.type == "mod" then - conf_path = path .. DIR_DELIM .. "mod.conf" + local actual_type = pkgmgr.get_folder_type(path) + if actual_type.type == "modpack" then + conf_path = path .. DIR_DELIM .. "modpack.conf" + else + conf_path = path .. DIR_DELIM .. "mod.conf" + end elseif result.package.type == "game" then conf_path = path .. DIR_DELIM .. "game.conf" name_is_title = true |