Mercurial > prosody-hg

comparison loader.lua @ 14065:50b8d732c905

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
loader: Revert bad idea Reverts 76ece4dd9782
author Kim Alvefur <zash@zash.se>
date Mon, 09 Feb 2026 15:54:02 +0100
parents 76ece4dd9782
children
comparison
equal deleted inserted replaced
14064:76ece4dd9782 14065:50b8d732c905
1 -- Allow for both require"util.foo" and require"prosody.util.foo" for a 1 -- Allow for both require"util.foo" and require"prosody.util.foo" for a
2 -- transition period while we update all require calls. 2 -- transition period while we update all require calls.
3 3
4 if (...) == "prosody.loader" then 4 if (...) == "prosody.loader" then
5 local function is_relative(path)
6 local path_sep = package.config:sub(1,1);
7 return ((path_sep == "/" and path:sub(1,1) ~= "/")
8 or (path_sep == "\\" and (path:sub(1,1) ~= "/" and path:sub(2,3) ~= ":\\")))
9 end
10 local function filter_relative_paths(path)
11 if is_relative(path) then return ""; end
12 end
13 local function sanitise_paths(paths)
14 return (paths:gsub("[^;]+;?", filter_relative_paths):gsub(";;+", ";"));
15 end
16
17 -- For require"util.foo" also look in paths equivalent to "prosody.util.foo" 5 -- For require"util.foo" also look in paths equivalent to "prosody.util.foo"
18 package.path = sanitise_paths(CFG_SOURCEDIR.."/?.lua;"..package.path:gsub("([^;]*)(?[^;]*)", "%1prosody/%2;%1%2")); 6 package.path = package.path:gsub("([^;]*)(?[^;]*)", "%1prosody/%2;%1%2");
19 package.cpath = sanitise_paths(CFG_SOURCEDIR.."/?.so;"..package.cpath:gsub("([^;]*)(?[^;]*)", "%1prosody/%2;%1%2")); 7 package.cpath = package.cpath:gsub("([^;]*)(?[^;]*)", "%1prosody/%2;%1%2");
20 else 8 else
21 -- When requiring "prosody.x", also look for "x" 9 -- When requiring "prosody.x", also look for "x"
22 for i = #package.searchers, 1, -1 do 10 for i = #package.searchers, 1, -1 do
23 local search = package.searchers[i]; 11 local search = package.searchers[i];
24 table.insert(package.searchers, i, function(module_name) 12 table.insert(package.searchers, i, function(module_name)