diff options
| author | Kim Alvefur <zash@zash.se> | 2020-11-05 22:31:25 +0100 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2020-11-05 22:31:25 +0100 |
| commit | 0c94d96263cffcdbe0cf5ea59ef0b172b32258c2 (patch) | |
| tree | 58547de6e7795740633c1b93e67c217eb621fe8f /util/pluginloader.lua | |
| parent | 20cb21003f0374e7078e1a29ffb36a7028c6b9ef (diff) | |
| parent | 4afbfc6854ebc374acc34729fdc6e472b44b07f1 (diff) | |
| download | prosody-0c94d96263cffcdbe0cf5ea59ef0b172b32258c2.tar.gz prosody-0c94d96263cffcdbe0cf5ea59ef0b172b32258c2.zip | |
Merge 0.11->trunk
Diffstat (limited to 'util/pluginloader.lua')
| -rw-r--r-- | util/pluginloader.lua | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/util/pluginloader.lua b/util/pluginloader.lua index 9ab8f245..8e37ffc4 100644 --- a/util/pluginloader.lua +++ b/util/pluginloader.lua @@ -8,6 +8,7 @@ -- luacheck: ignore 113/CFG_PLUGINDIR local dir_sep, path_sep = package.config:match("^(%S+)%s(%S+)"); +local lua_version = _VERSION:match(" (.+)$"); local plugin_dir = {}; for path in (CFG_PLUGINDIR or "./plugins/"):gsub("[/\\]", dir_sep):gmatch("[^"..path_sep.."]+") do path = path..dir_sep; -- add path separator to path end @@ -36,12 +37,13 @@ end local function load_resource(plugin, resource) resource = resource or "mod_"..plugin..".lua"; - 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..resource; + "share"..dir_sep.."lua"..dir_sep..lua_version..dir_sep.."mod_"..plugin..dir_sep..resource; }; return load_file(names); @@ -58,6 +60,9 @@ end local function load_code_ext(plugin, resource, extension, env) local content, err = load_resource(plugin, resource.."."..extension); + if not content and extension == "lib.lua" then + content, err = load_resource(plugin, resource..".lua"); + end if not content then content, err = load_resource(resource, resource.."."..extension); if not content then |