Software / code / prosody
Diff
util/paths.lua @ 10210:9fdda9fafc3c
Merge mod-installer (2019 GSoC by João Duarte)
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Mon, 19 Aug 2019 12:17:17 +0100 |
| parent | 10204:fbd4a5bc3a01 |
| child | 10402:0971694b30a8 |
line wrap: on
line diff
--- a/util/paths.lua Sat Aug 17 15:40:52 2019 +0200 +++ b/util/paths.lua Mon Aug 19 12:17:17 2019 +0100 @@ -41,4 +41,20 @@ return t_concat({...}, path_sep); end +function path_util.complement_lua_path(installer_plugin_path) + -- Checking for duplicates + -- The commands using luarocks need the path to the directory that has the /share and /lib folders. + local lua_version = _VERSION:match(" (.+)$"); + local lua_path_sep = package.config:sub(3,3); + local dir_sep = package.config:sub(1,1); + local sub_path = dir_sep.."lua"..dir_sep..lua_version..dir_sep; + if not string.match(package.path, installer_plugin_path) then + package.path = package.path..lua_path_sep..installer_plugin_path..dir_sep.."share"..sub_path.."?.lua"; + package.path = package.path..lua_path_sep..installer_plugin_path..dir_sep.."share"..sub_path.."?"..dir_sep.."init.lua"; + end + if not string.match(package.path, installer_plugin_path) then + package.cpath = package.cpath..lua_path_sep..installer_plugin_path..dir_sep.."lib"..sub_path.."?.so"; + end +end + return path_util;