util/startup.lua
changeset 11143 2187643b8e20
parent 11142 2a19d61f4ae4
child 11148 2b9f7c537acb
equal deleted inserted replaced
11142:2a19d61f4ae4 11143:2187643b8e20
   258 		prosody.paths.plugins = CFG_PLUGINDIR;
   258 		prosody.paths.plugins = CFG_PLUGINDIR;
   259 	end
   259 	end
   260 end
   260 end
   261 
   261 
   262 function startup.setup_plugin_install_path()
   262 function startup.setup_plugin_install_path()
   263 	local installer_plugin_path = config.get("*", "installer_plugin_path") or CFG_DATADIR.."/custom_plugins";
   263 	local installer_plugin_path = config.get("*", "installer_plugin_path") or (CFG_DATADIR or "data").."/custom_plugins";
   264 	local path_sep = package.config:sub(3,3);
   264 	local path_sep = package.config:sub(3,3);
   265 	-- TODO Figure out what this should be relative to, because CWD could be anywhere
   265 	-- TODO Figure out what this should be relative to, because CWD could be anywhere
   266 	installer_plugin_path = config.resolve_relative_path(require "lfs".currentdir(), installer_plugin_path);
   266 	installer_plugin_path = config.resolve_relative_path(require "lfs".currentdir(), installer_plugin_path);
   267 	-- TODO Can probably move directory creation to the install command
   267 	-- TODO Can probably move directory creation to the install command
   268 	require "lfs".mkdir(installer_plugin_path);
   268 	require "lfs".mkdir(installer_plugin_path);