aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoão Duarte <jvsDuarte08@gmail.com>2019-08-01 08:28:24 -0700
committerJoão Duarte <jvsDuarte08@gmail.com>2019-08-01 08:28:24 -0700
commitf27cd24e27134ff803e57768d1adac625f154162 (patch)
tree53da643efa3d166b0ae5514ae7340c7ef50a78ed
parentd2fc41c9e754d20a7c432b10b2db4f840e8fae54 (diff)
downloadprosody-f27cd24e27134ff803e57768d1adac625f154162.tar.gz
prosody-f27cd24e27134ff803e57768d1adac625f154162.zip
util.startup: setup_plugindir now also checks package.cpath for duplicates
-rw-r--r--util/startup.lua6
1 files changed, 4 insertions, 2 deletions
diff --git a/util/startup.lua b/util/startup.lua
index abf985f8..6ba81819 100644
--- a/util/startup.lua
+++ b/util/startup.lua
@@ -240,11 +240,13 @@ function startup.setup_plugindir()
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");