Software / code / prosody
Changeset
10196:5e1012f2f2b7
util.startup: setup_plugindir now also checks package.cpath for duplicates
| author | João Duarte <jvsDuarte08@gmail.com> |
|---|---|
| date | Thu, 01 Aug 2019 08:28:24 -0700 |
| parents | 10195:3409f746f978 |
| children | 10197:91085371cfc5 |
| files | util/startup.lua |
| diffstat | 1 files changed, 4 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/util/startup.lua Thu Aug 01 08:08:06 2019 -0700 +++ b/util/startup.lua Thu Aug 01 08:28:24 2019 -0700 @@ -240,11 +240,13 @@ require "lfs".mkdir(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 sub_path = dir_sep.."lua"..dir_sep..lua_version..dir_sep if not string.match(package.path, installer_plugin_path) then - local lua_version = _VERSION:match(" (.+)$") - local sub_path = dir_sep.."lua"..dir_sep..lua_version..dir_sep package.path = package.path..path_sep..installer_plugin_path..dir_sep.."share"..sub_path.."?.lua"; package.path = package.path..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..path_sep..installer_plugin_path..dir_sep.."lib"..sub_path.."?.lua"; end CFG_PLUGINDIR = installer_plugin_path..path_sep..(CFG_PLUGINDIR or "plugins");
