diff options
| author | Matthew Wild <mwild1@gmail.com> | 2019-08-19 12:17:17 +0100 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2019-08-19 12:17:17 +0100 |
| commit | 9f32d30e97c325810bba0ce17fef4491fac2f365 (patch) | |
| tree | 0b8157172fb508a4b962032d663b6d9b2e31a600 /util/pluginloader.lua | |
| parent | 469ce79a49fabbe0d42115fa7a2f1a27e3bae3f1 (diff) | |
| parent | 6ae5f04781c82e8064ceb9acc91ab9cfdb295969 (diff) | |
| download | prosody-9f32d30e97c325810bba0ce17fef4491fac2f365.tar.gz prosody-9f32d30e97c325810bba0ce17fef4491fac2f365.zip | |
Merge mod-installer (2019 GSoC by João Duarte)
Diffstat (limited to 'util/pluginloader.lua')
| -rw-r--r-- | util/pluginloader.lua | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/util/pluginloader.lua b/util/pluginloader.lua index 9ab8f245..af0428c4 100644 --- a/util/pluginloader.lua +++ b/util/pluginloader.lua @@ -36,12 +36,13 @@ end 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); |