# HG changeset patch
# User João Duarte <jvsDuarte08@gmail.com>
# Date 1564673304 25200
# Node ID 5e1012f2f2b7d67d45f67b4282aecb3532152f3f
# Parent  3409f746f978e5508c472cc3920fd3a2972fded3
util.startup: setup_plugindir now also checks package.cpath for duplicates

diff -r 3409f746f978 -r 5e1012f2f2b7 util/startup.lua
--- 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");