mirrors/prosody
1
0
Fork 0
mirror of https://github.com/bjc/prosody.git synced 2025-04-03 21:27:38 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

prosody.loader: Incorporate search path rewrite patch from Debian packages

Browse source 
Nice to drop that patch.

Will allow loading this to do something both when installed under a
prosody directory or from a source checkout.
This commit is contained in:
Kim Alvefur 2023-03-17 14:36:02 +01:00
parent d33f55156b
commit d06cc5176b
1 changed files with 20 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

14
loader.lua
View file

@ -1,4 +1,15 @@
for i = #package.searchers, 1, -1 do -- Allow for both require"util.foo" and require"prosody.util.foo" for a
-- transition period while we update all require calls.
if (...) == "prosody.loader" then
if not package.path:find "prosody" then
-- For require"util.foo" also look in paths equivalent to "prosody.util.foo"
package.path = package.path:gsub("([^;]*)(?[^;]*)", "%1prosody/%2;%1%2");
package.cpath = package.cpath:gsub("([^;]*)(?[^;]*)", "%1prosody/%2;%1%2");
end
else
-- When requiring "prosody.x", also look for "x"
for i = #package.searchers, 1, -1 do
local search = package.searchers[i]; local search = package.searchers[i];
table.insert(package.searchers, i, function(module_name) table.insert(package.searchers, i, function(module_name)
local lib = module_name:match("^prosody%.(.*)$"); local lib = module_name:match("^prosody%.(.*)$");
@ -6,4 +17,5 @@ for i = #package.searchers, 1, -1 do
return search(lib); return search(lib);
end end
end) end)
end
end end