Mercurial > prosody-hg

comparison util/paths.lua @ 10402:0971694b30a8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
util.paths: Don't treat path as pattern, fix traceback (thanks Menel87)
author Kim Alvefur <zash@zash.se>
date Fri, 08 Nov 2019 19:25:57 +0100
parents fbd4a5bc3a01
children 2ac63715ef6f
comparison
equal deleted inserted replaced
10401:1ef1f6c43c5b 10402:0971694b30a8
46 -- The commands using luarocks need the path to the directory that has the /share and /lib folders. 46 -- The commands using luarocks need the path to the directory that has the /share and /lib folders.
47 local lua_version = _VERSION:match(" (.+)$"); 47 local lua_version = _VERSION:match(" (.+)$");
48 local lua_path_sep = package.config:sub(3,3); 48 local lua_path_sep = package.config:sub(3,3);
49 local dir_sep = package.config:sub(1,1); 49 local dir_sep = package.config:sub(1,1);
50 local sub_path = dir_sep.."lua"..dir_sep..lua_version..dir_sep; 50 local sub_path = dir_sep.."lua"..dir_sep..lua_version..dir_sep;
51 if not string.match(package.path, installer_plugin_path) then 51 if not string.find(package.path, installer_plugin_path, 1, true) then
52 package.path = package.path..lua_path_sep..installer_plugin_path..dir_sep.."share"..sub_path.."?.lua"; 52 package.path = package.path..lua_path_sep..installer_plugin_path..dir_sep.."share"..sub_path.."?.lua";
53 package.path = package.path..lua_path_sep..installer_plugin_path..dir_sep.."share"..sub_path.."?"..dir_sep.."init.lua"; 53 package.path = package.path..lua_path_sep..installer_plugin_path..dir_sep.."share"..sub_path.."?"..dir_sep.."init.lua";
54 end 54 end
55 if not string.match(package.path, installer_plugin_path) then 55 if not string.find(package.path, installer_plugin_path, 1, true) then
56 package.cpath = package.cpath..lua_path_sep..installer_plugin_path..dir_sep.."lib"..sub_path.."?.so"; 56 package.cpath = package.cpath..lua_path_sep..installer_plugin_path..dir_sep.."lib"..sub_path.."?.so";
57 end 57 end
58 end 58 end
59 59
60 return path_util; 60 return path_util;