# HG changeset patch
# User João Duarte <jvsDuarte08@gmail.com>
# Date 1564676980 25200
# Node ID 2457b6b1908b02b49462fc442add87ac56e3f416
# Parent  48ee50ed9972da616b1305b252f8c32fe7482cea
util.startup: Reorganized code at setup_plugindir

diff -r 48ee50ed9972 -r 2457b6b1908b util/startup.lua
--- a/util/startup.lua	Thu Aug 01 09:29:18 2019 -0700
+++ b/util/startup.lua	Thu Aug 01 09:29:40 2019 -0700
@@ -229,15 +229,15 @@
 	local custom_plugin_paths = config.get("*", "plugin_paths");
 	local installer_plugin_path = config.get("*", "installer_plugin_path") or "custom_plugins";
 	local path_sep = package.config:sub(3,3);
+	installer_plugin_path = config.resolve_relative_path(require "lfs".currentdir(), installer_plugin_path);
+	require "lfs".mkdir(installer_plugin_path);
+	config.complement_lua_path(installer_plugin_path);
 	if custom_plugin_paths then
 		-- path1;path2;path3;defaultpath...
 		-- luacheck: ignore 111
 		CFG_PLUGINDIR = table.concat(custom_plugin_paths, path_sep)..path_sep..(CFG_PLUGINDIR or "plugins");
 		prosody.paths.plugins = CFG_PLUGINDIR;
 	end
-	installer_plugin_path = config.resolve_relative_path(require "lfs".currentdir(), installer_plugin_path);
-	require "lfs".mkdir(installer_plugin_path);
-	config.complement_lua_path(installer_plugin_path);
 	CFG_PLUGINDIR = installer_plugin_path..path_sep..(CFG_PLUGINDIR or "plugins");
 	prosody.paths.plugins = CFG_PLUGINDIR;
 end