prosody
8796aa94c4b5
util/pluginloader.lua

Find changesets by keywords by author, files, the commit message, revision number or hash, or revset expression.

Software / code / prosody

Comparison

util/pluginloader.lua @ 6031:8796aa94c4b5

Merge 0.9->0.10
author Kim Alvefur <zash@zash.se>
date Sun, 09 Mar 2014 23:47:53 +0100
parent 5776:bd0ff8ae98a8
parent 6029:dd3d4cfbd3cb
child 6777:5de6b93d0190
comparison
equal deleted inserted replaced
6027:8c69cea8a1bf 6031:8796aa94c4b5
37 37
38 function load_resource(plugin, resource) 38 function load_resource(plugin, resource)
39 resource = resource or "mod_"..plugin..".lua"; 39 resource = resource or "mod_"..plugin..".lua";
40 40
41 local names = { 41 local names = {
42 "mod_"..plugin.."/"..plugin.."/"..resource; -- mod_hello/hello/mod_hello.lua 42 "mod_"..plugin..dir_sep..plugin..dir_sep..resource; -- mod_hello/hello/mod_hello.lua
43 "mod_"..plugin.."/"..resource; -- mod_hello/mod_hello.lua 43 "mod_"..plugin..dir_sep..resource; -- mod_hello/mod_hello.lua
44 plugin.."/"..resource; -- hello/mod_hello.lua 44 plugin..dir_sep..resource; -- hello/mod_hello.lua
45 resource; -- mod_hello.lua 45 resource; -- mod_hello.lua
46 }; 46 };
47 47
48 return load_file(names); 48 return load_file(names);
49 end 49 end
50 50