Mercurial > prosody-hg

comparison util/startup.lua @ 10203:3beb37ed7f32

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
util.startup: Changed the way util.paths.complement_lua_path was being accessed
author João Duarte <jvsDuarte08@gmail.com>
date Fri, 16 Aug 2019 09:26:36 -0700
parents 2457b6b1908b
children 9fdda9fafc3c
comparison
equal deleted inserted replaced
10202:d3764eed7ded 10203:3beb37ed7f32
229 local custom_plugin_paths = config.get("*", "plugin_paths"); 229 local custom_plugin_paths = config.get("*", "plugin_paths");
230 local installer_plugin_path = config.get("*", "installer_plugin_path") or "custom_plugins"; 230 local installer_plugin_path = config.get("*", "installer_plugin_path") or "custom_plugins";
231 local path_sep = package.config:sub(3,3); 231 local path_sep = package.config:sub(3,3);
232 installer_plugin_path = config.resolve_relative_path(require "lfs".currentdir(), installer_plugin_path); 232 installer_plugin_path = config.resolve_relative_path(require "lfs".currentdir(), installer_plugin_path);
233 require "lfs".mkdir(installer_plugin_path); 233 require "lfs".mkdir(installer_plugin_path);
234 config.complement_lua_path(installer_plugin_path); 234 require"util.paths".complement_lua_path(installer_plugin_path);
235 if custom_plugin_paths then 235 if custom_plugin_paths then
236 -- path1;path2;path3;defaultpath... 236 -- path1;path2;path3;defaultpath...
237 -- luacheck: ignore 111 237 -- luacheck: ignore 111
238 CFG_PLUGINDIR = table.concat(custom_plugin_paths, path_sep)..path_sep..(CFG_PLUGINDIR or "plugins"); 238 CFG_PLUGINDIR = table.concat(custom_plugin_paths, path_sep)..path_sep..(CFG_PLUGINDIR or "plugins");
239 prosody.paths.plugins = CFG_PLUGINDIR; 239 prosody.paths.plugins = CFG_PLUGINDIR;