Software /
code /
prosody
Diff
util/pluginloader.lua @ 10411:db2a06b9ff98
Merge 0.11->trunk
author | Kim Alvefur <zash@zash.se> |
---|---|
date | Sat, 16 Nov 2019 16:52:31 +0100 |
parent | 10205:ff8de86b75f0 |
child | 11129:387d442497e7 |
line wrap: on
line diff
--- a/util/pluginloader.lua Sat Nov 16 16:45:33 2019 +0100 +++ b/util/pluginloader.lua Sat Nov 16 16:52:31 2019 +0100 @@ -36,12 +36,13 @@ local function load_resource(plugin, resource) resource = resource or "mod_"..plugin..".lua"; - + local lua_version = _VERSION:match(" (.+)$"); local names = { "mod_"..plugin..dir_sep..plugin..dir_sep..resource; -- mod_hello/hello/mod_hello.lua "mod_"..plugin..dir_sep..resource; -- mod_hello/mod_hello.lua plugin..dir_sep..resource; -- hello/mod_hello.lua resource; -- mod_hello.lua + "share"..dir_sep.."lua"..dir_sep..lua_version..dir_sep.."mod_"..plugin..dir_sep..resource; }; return load_file(names);