From 122bde2f2c4816e89bd02be36e0e9f1ee31f7557 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Duarte?= <jvsDuarte08@gmail.com>
Date: Tue, 25 Jun 2019 13:20:54 +0100
Subject: util.prosodyctl: Moved the 'admin_operation' function from prosodyctl
 to here

---
 util/prosodyctl.lua | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

(limited to 'util')

diff --git a/util/prosodyctl.lua b/util/prosodyctl.lua
index 9b627bde..e2bc4369 100644
--- a/util/prosodyctl.lua
+++ b/util/prosodyctl.lua
@@ -278,6 +278,22 @@ local function reload()
 	return true;
 end
 
+local function admin_operation(operation, arg)
+  local modules, tree, server, refresh = "", "", "", ""
+  for i, _ in ipairs(arg) do
+    if arg[i]:sub(1, #"--tree=") == "--tree=" then
+      tree = arg[i].." "
+    elseif arg[i]:sub(1, #"--server=") == "--server=" then
+      server = arg[i].." "
+    elseif arg[i]:sub(1, #"--no-refresh") == "--no-refresh" then
+      refresh = arg[i].." "
+    else
+      modules=modules..arg[i].." "
+    end
+  end
+  os.execute("luarocks-admin "..tree..operation..server..refresh..modules)
+end
+
 return {
 	show_message = show_message;
 	show_warning = show_message;
@@ -297,4 +313,5 @@ return {
 	start = start;
 	stop = stop;
 	reload = reload;
+  admin_operation = admin_operation;
 };
-- 
cgit v1.2.3


From 7555016ac24cb681b2c443324652a5cc9df61799 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Duarte?= <jvsDuarte08@gmail.com>
Date: Thu, 27 Jun 2019 18:01:36 +0100
Subject: util.prosodyctl: Added help support to 'admin_operation'

---
 util/prosodyctl.lua | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'util')

diff --git a/util/prosodyctl.lua b/util/prosodyctl.lua
index e2bc4369..c2235e85 100644
--- a/util/prosodyctl.lua
+++ b/util/prosodyctl.lua
@@ -279,6 +279,11 @@ local function reload()
 end
 
 local function admin_operation(operation, arg)
+  if arg[1] == "--help" then
+    print(" admin-"..operation)
+    print("    "..operation.."plugins from a server (repository)")
+    return 1;
+	end
   local modules, tree, server, refresh = "", "", "", ""
   for i, _ in ipairs(arg) do
     if arg[i]:sub(1, #"--tree=") == "--tree=" then
-- 
cgit v1.2.3


From c21b60857f9f0f6b15e9f95ee11ec6291b56c574 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Duarte?= <jvsDuarte08@gmail.com>
Date: Sat, 20 Jul 2019 12:41:31 -0700
Subject: util.prosodyctl: Corrected indentation on my code

---
 util/prosodyctl.lua | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

(limited to 'util')

diff --git a/util/prosodyctl.lua b/util/prosodyctl.lua
index c2235e85..6f7bf065 100644
--- a/util/prosodyctl.lua
+++ b/util/prosodyctl.lua
@@ -279,24 +279,24 @@ local function reload()
 end
 
 local function admin_operation(operation, arg)
-  if arg[1] == "--help" then
-    print(" admin-"..operation)
-    print("    "..operation.."plugins from a server (repository)")
-    return 1;
-	end
-  local modules, tree, server, refresh = "", "", "", ""
-  for i, _ in ipairs(arg) do
-    if arg[i]:sub(1, #"--tree=") == "--tree=" then
-      tree = arg[i].." "
-    elseif arg[i]:sub(1, #"--server=") == "--server=" then
-      server = arg[i].." "
-    elseif arg[i]:sub(1, #"--no-refresh") == "--no-refresh" then
-      refresh = arg[i].." "
-    else
-      modules=modules..arg[i].." "
-    end
-  end
-  os.execute("luarocks-admin "..tree..operation..server..refresh..modules)
+	if arg[1] == "--help" then
+		print(" admin-"..operation)
+		print("    "..operation.."plugins from a server (repository)")
+		return 1;
+	end
+	local modules, tree, server, refresh = "", "", "", ""
+	for i, _ in ipairs(arg) do
+		if arg[i]:sub(1, #"--tree=") == "--tree=" then
+			tree = arg[i].." "
+		elseif arg[i]:sub(1, #"--server=") == "--server=" then
+			server = arg[i].." "
+		elseif arg[i]:sub(1, #"--no-refresh") == "--no-refresh" then
+			refresh = arg[i].." "
+		else
+			modules=modules..arg[i].." "
+		end
+	end
+	os.execute("luarocks-admin "..tree..operation..server..refresh..modules)
 end
 
 return {
-- 
cgit v1.2.3


From 94ddde2e9e756f420fd6f6d271acbc1f7df630b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Duarte?= <jvsDuarte08@gmail.com>
Date: Tue, 23 Jul 2019 10:24:55 -0700
Subject: util.prosodyctl: Added the show_module_configuration_help function

---
 util/prosodyctl.lua | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'util')

diff --git a/util/prosodyctl.lua b/util/prosodyctl.lua
index 6f7bf065..84f65665 100644
--- a/util/prosodyctl.lua
+++ b/util/prosodyctl.lua
@@ -39,6 +39,16 @@ local function show_usage(usage, desc)
 	end
 end
 
+local function show_module_configuration_help(mod_name)
+	print("Done.")
+	print("If you installed a prosody plugin, don't forget to add its name under the 'modules_enabled' section inside your configuration file.")
+	print("Depending on the module, there might be further configuration steps required.")
+	print("")
+	print("More info about: ")
+	print("	modules_enabled: https://prosody.im/doc/modules_enabled")
+	print("	"..mod_name..": https://modules.prosody.im/"..mod_name..".html")
+end
+
 local function getchar(n)
 	local stty_ret = os.execute("stty raw -echo 2>/dev/null");
 	local ok, char;
@@ -303,6 +313,7 @@ return {
 	show_message = show_message;
 	show_warning = show_message;
 	show_usage = show_usage;
+	show_module_configuration_help = show_module_configuration_help;
 	getchar = getchar;
 	getline = getline;
 	getpass = getpass;
-- 
cgit v1.2.3


From c84fa6fd262025b7394f4e51992ffaacdb9c6eb3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Duarte?= <jvsDuarte08@gmail.com>
Date: Wed, 24 Jul 2019 04:44:44 -0700
Subject: util.prosodyctl: Removed the admin_operation command

---
 util/prosodyctl.lua | 22 ----------------------
 1 file changed, 22 deletions(-)

(limited to 'util')

diff --git a/util/prosodyctl.lua b/util/prosodyctl.lua
index 84f65665..5e19937e 100644
--- a/util/prosodyctl.lua
+++ b/util/prosodyctl.lua
@@ -288,27 +288,6 @@ local function reload()
 	return true;
 end
 
-local function admin_operation(operation, arg)
-	if arg[1] == "--help" then
-		print(" admin-"..operation)
-		print("    "..operation.."plugins from a server (repository)")
-		return 1;
-	end
-	local modules, tree, server, refresh = "", "", "", ""
-	for i, _ in ipairs(arg) do
-		if arg[i]:sub(1, #"--tree=") == "--tree=" then
-			tree = arg[i].." "
-		elseif arg[i]:sub(1, #"--server=") == "--server=" then
-			server = arg[i].." "
-		elseif arg[i]:sub(1, #"--no-refresh") == "--no-refresh" then
-			refresh = arg[i].." "
-		else
-			modules=modules..arg[i].." "
-		end
-	end
-	os.execute("luarocks-admin "..tree..operation..server..refresh..modules)
-end
-
 return {
 	show_message = show_message;
 	show_warning = show_message;
@@ -329,5 +308,4 @@ return {
 	start = start;
 	stop = stop;
 	reload = reload;
-  admin_operation = admin_operation;
 };
-- 
cgit v1.2.3


From 20f233099eaf3122df6acc163bcd119f6b877c89 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Duarte?= <jvsDuarte08@gmail.com>
Date: Wed, 24 Jul 2019 10:37:01 -0700
Subject: util.startup: Now it also loads default or configured paths to custom
 plugin directories and creates them

---
 util/startup.lua | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'util')

diff --git a/util/startup.lua b/util/startup.lua
index 7a1a95aa..65a131fe 100644
--- a/util/startup.lua
+++ b/util/startup.lua
@@ -227,6 +227,7 @@ end
 
 function startup.setup_plugindir()
 	local custom_plugin_paths = config.get("*", "plugin_paths");
+	local installer_plugin_paths = config.get("*", "installer_plugin_paths") or {"custom_plugins"};
 	if custom_plugin_paths then
 		local path_sep = package.config:sub(3,3);
 		-- path1;path2;path3;defaultpath...
@@ -234,6 +235,17 @@ function startup.setup_plugindir()
 		CFG_PLUGINDIR = table.concat(custom_plugin_paths, path_sep)..path_sep..(CFG_PLUGINDIR or "plugins");
 		prosody.paths.plugins = CFG_PLUGINDIR;
 	end
+	if installer_plugin_paths then
+		for path, _ in ipairs(installer_plugin_paths) do
+			if os.execute('[ -d "'..installer_plugin_paths[path]..'" ]') ~= 0 then
+				os.execute("mkdir "..installer_plugin_paths[path])
+			end
+		end
+		local path_sep = package.config:sub(3,3);
+		-- luacheck: ignore 111
+		CFG_PLUGINDIR = table.concat(installer_plugin_paths, path_sep)..path_sep..(CFG_PLUGINDIR or "plugins");
+		prosody.paths.plugins = CFG_PLUGINDIR;
+	end
 end
 
 function startup.chdir()
-- 
cgit v1.2.3


From 52f963350f11ac6317bcf2ac1e184a6c0f7b9c68 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Duarte?= <jvsDuarte08@gmail.com>
Date: Wed, 24 Jul 2019 11:20:35 -0700
Subject: util.prosodyctl: Created the helper function get_path_custom_plugins

---
 util/prosodyctl.lua | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'util')

diff --git a/util/prosodyctl.lua b/util/prosodyctl.lua
index 5e19937e..fbeb9540 100644
--- a/util/prosodyctl.lua
+++ b/util/prosodyctl.lua
@@ -288,6 +288,14 @@ local function reload()
 	return true;
 end
 
+local function get_path_custom_plugins(plugin_paths)
+		-- I'm considering that we are using just one path to custom plugins, and it is the first in prosody.paths.plugins, for now
+	-- luacheck: ignore 512
+	for path in plugin_paths:gmatch("[^;]+") do
+		return path
+	end
+end
+
 return {
 	show_message = show_message;
 	show_warning = show_message;
@@ -308,4 +316,5 @@ return {
 	start = start;
 	stop = stop;
 	reload = reload;
+	get_path_custom_plugins = get_path_custom_plugins;
 };
-- 
cgit v1.2.3


From c20cc1a17b2bd0ef75ad2c26e288011902b57206 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Duarte?= <jvsDuarte08@gmail.com>
Date: Thu, 25 Jul 2019 06:46:04 -0700
Subject: util.startup: Removed unnecessary if clause at startup.set_plugindir

---
 util/startup.lua | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

(limited to 'util')

diff --git a/util/startup.lua b/util/startup.lua
index 65a131fe..54b968f8 100644
--- a/util/startup.lua
+++ b/util/startup.lua
@@ -235,17 +235,15 @@ function startup.setup_plugindir()
 		CFG_PLUGINDIR = table.concat(custom_plugin_paths, path_sep)..path_sep..(CFG_PLUGINDIR or "plugins");
 		prosody.paths.plugins = CFG_PLUGINDIR;
 	end
-	if installer_plugin_paths then
-		for path, _ in ipairs(installer_plugin_paths) do
-			if os.execute('[ -d "'..installer_plugin_paths[path]..'" ]') ~= 0 then
-				os.execute("mkdir "..installer_plugin_paths[path])
-			end
+	for path, _ in ipairs(installer_plugin_paths) do
+		if os.execute('[ -d "'..installer_plugin_paths[path]..'" ]') ~= 0 then
+			os.execute("mkdir "..installer_plugin_paths[path])
 		end
-		local path_sep = package.config:sub(3,3);
-		-- luacheck: ignore 111
-		CFG_PLUGINDIR = table.concat(installer_plugin_paths, path_sep)..path_sep..(CFG_PLUGINDIR or "plugins");
-		prosody.paths.plugins = CFG_PLUGINDIR;
 	end
+	local path_sep = package.config:sub(3,3);
+	-- luacheck: ignore 111
+	CFG_PLUGINDIR = table.concat(installer_plugin_paths, path_sep)..path_sep..(CFG_PLUGINDIR or "plugins");
+	prosody.paths.plugins = CFG_PLUGINDIR;
 end
 
 function startup.chdir()
-- 
cgit v1.2.3


From 63071336691c272dded2c1b7d74e58d78a6ae8ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Duarte?= <jvsDuarte08@gmail.com>
Date: Fri, 26 Jul 2019 08:39:27 -0700
Subject: util.startup: The .setup_plugindir function now correctly sets a
 default/specified path for custom plugins

---
 util/startup.lua | 26 ++++++++++++++++----------
 1 file changed, 16 insertions(+), 10 deletions(-)

(limited to 'util')

diff --git a/util/startup.lua b/util/startup.lua
index 54b968f8..363d8465 100644
--- a/util/startup.lua
+++ b/util/startup.lua
@@ -226,23 +226,29 @@ function startup.setup_datadir()
 end
 
 function startup.setup_plugindir()
+	--require "lfs".currentdir()
+	--local current_directory = lfs.currentdir()
 	local custom_plugin_paths = config.get("*", "plugin_paths");
-	local installer_plugin_paths = config.get("*", "installer_plugin_paths") or {"custom_plugins"};
+	local installer_plugin_path = config.get("*", "installer_plugin_path") or "custom_plugins";
+	local path_sep = package.config:sub(3,3);
 	if custom_plugin_paths then
-		local path_sep = package.config:sub(3,3);
 		-- 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
-	for path, _ in ipairs(installer_plugin_paths) do
-		if os.execute('[ -d "'..installer_plugin_paths[path]..'" ]') ~= 0 then
-			os.execute("mkdir "..installer_plugin_paths[path])
-		end
-	end
-	local path_sep = package.config:sub(3,3);
-	-- luacheck: ignore 111
-	CFG_PLUGINDIR = table.concat(installer_plugin_paths, path_sep)..path_sep..(CFG_PLUGINDIR or "plugins");
+	-- Checking if the folder exists. If it doesn't, we create it
+	--[[if os.execute('[ -d "'..installer_plugin_path..'" ]') ~= 0 then
+		os.execute("mkdir "..installer_plugin_path)
+	end]]
+	--[[if not string.find(package.path, current_directory..installer_plugin_path[path]) then
+		--os.execute("ls -la "..current_directory..path_sep..installer_plugin_paths[path])
+		package.path = package.path..path_sep..current_directory..installer_plugin_path.."/?.lua"..path_sep..path_sep
+		package.path = package.path..current_directory..installer_plugin_path.."/?/init.lua"..path_sep..path_sep
+		package.cpath = package.cpath..path_sep..current_directory..installer_plugin_path.."/?.lua"
+		package.cpath = package.cpath..path_sep..current_directory..installer_plugin_path.."/?/init.lua"
+	end]]
+	CFG_PLUGINDIR = installer_plugin_path..path_sep..(CFG_PLUGINDIR or "plugins");
 	prosody.paths.plugins = CFG_PLUGINDIR;
 end
 
-- 
cgit v1.2.3


From 093110478e9ad8bbc539a10b07ce968387255a74 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Duarte?= <jvsDuarte08@gmail.com>
Date: Fri, 26 Jul 2019 08:58:56 -0700
Subject: util.startup: .setup_plugindir now checks if the specified directory
 for custom plugins exists, and creates it if it doesn't

---
 util/startup.lua | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'util')

diff --git a/util/startup.lua b/util/startup.lua
index 363d8465..9ddb10b5 100644
--- a/util/startup.lua
+++ b/util/startup.lua
@@ -226,8 +226,8 @@ function startup.setup_datadir()
 end
 
 function startup.setup_plugindir()
-	--require "lfs".currentdir()
-	--local current_directory = lfs.currentdir()
+	--local lfs_currentdir = require "lfs".currentdir()
+	--local current_directory = lfs_currentdir
 	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);
@@ -238,9 +238,9 @@ function startup.setup_plugindir()
 		prosody.paths.plugins = CFG_PLUGINDIR;
 	end
 	-- Checking if the folder exists. If it doesn't, we create it
-	--[[if os.execute('[ -d "'..installer_plugin_path..'" ]') ~= 0 then
+	if os.execute('[ -d "'..installer_plugin_path..'" ]') ~= 0 then
 		os.execute("mkdir "..installer_plugin_path)
-	end]]
+	end
 	--[[if not string.find(package.path, current_directory..installer_plugin_path[path]) then
 		--os.execute("ls -la "..current_directory..path_sep..installer_plugin_paths[path])
 		package.path = package.path..path_sep..current_directory..installer_plugin_path.."/?.lua"..path_sep..path_sep
-- 
cgit v1.2.3


From ad26c41fa6a4ac22d08b62dbadd13e49156ed305 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Duarte?= <jvsDuarte08@gmail.com>
Date: Fri, 26 Jul 2019 17:54:37 -0700
Subject: util.startup: Improved  how .set_plugindir updates
 prosody.paths.plugins, package.path and package.cpath

---
 util/startup.lua | 38 +++++++++++++++++++++++++++-----------
 1 file changed, 27 insertions(+), 11 deletions(-)

(limited to 'util')

diff --git a/util/startup.lua b/util/startup.lua
index 9ddb10b5..4601bd85 100644
--- a/util/startup.lua
+++ b/util/startup.lua
@@ -226,28 +226,44 @@ function startup.setup_datadir()
 end
 
 function startup.setup_plugindir()
-	--local lfs_currentdir = require "lfs".currentdir()
-	--local current_directory = lfs_currentdir
 	local custom_plugin_paths = config.get("*", "plugin_paths");
 	local installer_plugin_path = config.get("*", "installer_plugin_path") or "custom_plugins";
+	-- This variable separates different paths, like this "," here -> /usr;/home
 	local path_sep = package.config:sub(3,3);
+	-- This variable is the separator between directories, in a path, like the "/" here -> /home/path/to/somewhere
+	local dir_sep = package.config:sub(1,1);
 	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
-	-- Checking if the folder exists. If it doesn't, we create it
+	-- Checks if installer_plugin_path is a relative paths and makes it an absolute path
+	if installer_plugin_path:sub(1,1) ~= "/" then
+		-- Works fine when executing prosody from source (configure and make only)
+		-- Probably wont be the best install directory, when using a package installation
+		local lfs_currentdir = require "lfs".currentdir();
+		local current_directory = lfs_currentdir;
+		-- Some normalization
+		installer_plugin_path = installer_plugin_path:gsub("^%.%"..dir_sep.."+", "");
+		installer_plugin_path = current_directory..dir_sep..installer_plugin_path;
+	end
+	-- Checking if the folder exists. If it doesn't, we create it, but we need permissions to do so
 	if os.execute('[ -d "'..installer_plugin_path..'" ]') ~= 0 then
-		os.execute("mkdir "..installer_plugin_path)
+		os.execute("mkdir "..installer_plugin_path);
+	end
+	-- Developers may have add these custom paths to their LUA_PATH/LUA_CPATH variables, before running prosody
+	-- Therefore, I'll just check if the paths we are about to add aren't already at package.(path/cpath)
+	if not string.match(package.path, installer_plugin_path) then
+		local lua_version = _VERSION:match(" (.+)$")
+		-- I'm assuming there's good reason not to hard code any separator
+		-- This next line is unnecessary, but I think it makes the code more readable and neat
+		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";
+		package.cpath = package.cpath..path_sep..installer_plugin_path..dir_sep.."lib"..sub_path.."?.lua";
 	end
-	--[[if not string.find(package.path, current_directory..installer_plugin_path[path]) then
-		--os.execute("ls -la "..current_directory..path_sep..installer_plugin_paths[path])
-		package.path = package.path..path_sep..current_directory..installer_plugin_path.."/?.lua"..path_sep..path_sep
-		package.path = package.path..current_directory..installer_plugin_path.."/?/init.lua"..path_sep..path_sep
-		package.cpath = package.cpath..path_sep..current_directory..installer_plugin_path.."/?.lua"
-		package.cpath = package.cpath..path_sep..current_directory..installer_plugin_path.."/?/init.lua"
-	end]]
+	-- The commands using luarocks need the path to the directory that has the /share and /lib folders.
 	CFG_PLUGINDIR = installer_plugin_path..path_sep..(CFG_PLUGINDIR or "plugins");
 	prosody.paths.plugins = CFG_PLUGINDIR;
 end
-- 
cgit v1.2.3


From d2524edff49771ad0c131ac85461241eb6cd99f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Duarte?= <jvsDuarte08@gmail.com>
Date: Wed, 31 Jul 2019 06:42:13 -0700
Subject: util.prosodyctl: Added the check_flags function

---
 util/prosodyctl.lua | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

(limited to 'util')

diff --git a/util/prosodyctl.lua b/util/prosodyctl.lua
index fbeb9540..affa2f6b 100644
--- a/util/prosodyctl.lua
+++ b/util/prosodyctl.lua
@@ -292,10 +292,20 @@ local function get_path_custom_plugins(plugin_paths)
 		-- I'm considering that we are using just one path to custom plugins, and it is the first in prosody.paths.plugins, for now
 	-- luacheck: ignore 512
 	for path in plugin_paths:gmatch("[^;]+") do
-		return path
+		return path;
 	end
 end
 
+local function check_flags(arg)
+	local flag = "--tree=";
+	-- There might not be any argument when the list command is calling this function
+	if arg[1] and arg[1]:sub(1, #flag) == flag then
+		local dir = arg[1]:match("=(.+)$")
+		return true, arg[2], dir;
+	end
+	return false, arg[1]
+end
+
 return {
 	show_message = show_message;
 	show_warning = show_message;
@@ -317,4 +327,5 @@ return {
 	stop = stop;
 	reload = reload;
 	get_path_custom_plugins = get_path_custom_plugins;
+	check_flags = check_flags;
 };
-- 
cgit v1.2.3


From b60081c28ce425696a3839d10039f23d6250e840 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Duarte?= <jvsDuarte08@gmail.com>
Date: Wed, 31 Jul 2019 07:24:43 -0700
Subject: util.prosodyctl: Added the call_luarocks function

---
 util/prosodyctl.lua | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'util')

diff --git a/util/prosodyctl.lua b/util/prosodyctl.lua
index affa2f6b..22571061 100644
--- a/util/prosodyctl.lua
+++ b/util/prosodyctl.lua
@@ -306,6 +306,12 @@ local function check_flags(arg)
 	return false, arg[1]
 end
 
+local function call_luarocks(operation, mod, dir)
+		show_message("Installing %s at %s", mod, dir);
+		os.execute("luarocks --tree='"..dir.."' --server='http://localhost/' "..operation.." "..mod);
+		show_module_configuration_help(mod);
+end
+
 return {
 	show_message = show_message;
 	show_warning = show_message;
@@ -328,4 +334,5 @@ return {
 	reload = reload;
 	get_path_custom_plugins = get_path_custom_plugins;
 	check_flags = check_flags;
+	call_luarocks = call_luarocks;
 };
-- 
cgit v1.2.3


From 289378113abb5b92d1628369fad66454b58cb738 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Duarte?= <jvsDuarte08@gmail.com>
Date: Wed, 31 Jul 2019 10:02:42 -0700
Subject: util.prosodyctl: Function now differentiates its output, depending if
 it is being called by install or remove

---
 util/prosodyctl.lua | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'util')

diff --git a/util/prosodyctl.lua b/util/prosodyctl.lua
index 22571061..a98a89d7 100644
--- a/util/prosodyctl.lua
+++ b/util/prosodyctl.lua
@@ -307,9 +307,15 @@ local function check_flags(arg)
 end
 
 local function call_luarocks(operation, mod, dir)
+	if operation == "install" then
 		show_message("Installing %s at %s", mod, dir);
-		os.execute("luarocks --tree='"..dir.."' --server='http://localhost/' "..operation.." "..mod);
+	elseif operation == "remove" then
+		show_message("Removing %s from %s", mod, dir);
+	end
+	os.execute("luarocks --tree='"..dir.."' --server='http://localhost/' "..operation.." "..mod);
+	if operation == "install" then
 		show_module_configuration_help(mod);
+	end
 end
 
 return {
-- 
cgit v1.2.3


From 2b8e9031a41af9046dc19c35e95f8cac0b4e67b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Duarte?= <jvsDuarte08@gmail.com>
Date: Wed, 31 Jul 2019 10:22:11 -0700
Subject: util.prosodyctl: call_luarocks function is now compatible with the
 list command

---
 util/prosodyctl.lua | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'util')

diff --git a/util/prosodyctl.lua b/util/prosodyctl.lua
index a98a89d7..7fe87dab 100644
--- a/util/prosodyctl.lua
+++ b/util/prosodyctl.lua
@@ -312,7 +312,11 @@ local function call_luarocks(operation, mod, dir)
 	elseif operation == "remove" then
 		show_message("Removing %s from %s", mod, dir);
 	end
-	os.execute("luarocks --tree='"..dir.."' --server='http://localhost/' "..operation.." "..mod);
+	if operation == "list" then
+		os.execute("luarocks list --tree='"..dir.."'")
+	else
+		os.execute("luarocks --tree='"..dir.."' --server='http://localhost/' "..operation.." "..mod);
+	end
 	if operation == "install" then
 		show_module_configuration_help(mod);
 	end
-- 
cgit v1.2.3


From 2049e20696aecd37419fafb8b38c96550b04a442 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Duarte?= <jvsDuarte08@gmail.com>
Date: Wed, 31 Jul 2019 11:00:20 -0700
Subject: util.prosodyctl: Added the execute_command function

---
 util/prosodyctl.lua | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

(limited to 'util')

diff --git a/util/prosodyctl.lua b/util/prosodyctl.lua
index 7fe87dab..274d611c 100644
--- a/util/prosodyctl.lua
+++ b/util/prosodyctl.lua
@@ -322,6 +322,19 @@ local function call_luarocks(operation, mod, dir)
 	end
 end
 
+local function execute_command(arg)
+	local operation = arg[#arg]
+	local tree, mod, dir = check_flags(arg);
+	if tree then
+		call_luarocks(operation, mod, dir);
+		return 0;
+	else
+		dir = get_path_custom_plugins(prosody.paths.plugins);
+		call_luarocks(operation, mod, dir);
+		return 0;
+	end
+end
+
 return {
 	show_message = show_message;
 	show_warning = show_message;
@@ -345,4 +358,5 @@ return {
 	get_path_custom_plugins = get_path_custom_plugins;
 	check_flags = check_flags;
 	call_luarocks = call_luarocks;
+	execute_command = execute_command;
 };
-- 
cgit v1.2.3


From 5aa4dda0fb32d81ee08d873bd9528ab26aa56c22 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Duarte?= <jvsDuarte08@gmail.com>
Date: Wed, 31 Jul 2019 11:08:43 -0700
Subject: util.prosodyctl: The check_flags function now considers that a
 module, if given, is specified at the penultimate argument it receives

---
 util/prosodyctl.lua | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'util')

diff --git a/util/prosodyctl.lua b/util/prosodyctl.lua
index 274d611c..bf65e396 100644
--- a/util/prosodyctl.lua
+++ b/util/prosodyctl.lua
@@ -301,9 +301,9 @@ local function check_flags(arg)
 	-- There might not be any argument when the list command is calling this function
 	if arg[1] and arg[1]:sub(1, #flag) == flag then
 		local dir = arg[1]:match("=(.+)$")
-		return true, arg[2], dir;
+		return true, arg[#arg-1], dir;
 	end
-	return false, arg[1]
+	return false, arg[#arg-1];
 end
 
 local function call_luarocks(operation, mod, dir)
-- 
cgit v1.2.3


From ee4ae338f9f6f4cbb162ff5c77c9873a38be8b33 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Duarte?= <jvsDuarte08@gmail.com>
Date: Thu, 1 Aug 2019 04:16:00 -0700
Subject: util.prosodyctl: Changed a comment

---
 util/prosodyctl.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'util')

diff --git a/util/prosodyctl.lua b/util/prosodyctl.lua
index bf65e396..c6abc02f 100644
--- a/util/prosodyctl.lua
+++ b/util/prosodyctl.lua
@@ -289,7 +289,7 @@ local function reload()
 end
 
 local function get_path_custom_plugins(plugin_paths)
-		-- I'm considering that we are using just one path to custom plugins, and it is the first in prosody.paths.plugins, for now
+		-- I'm considering that the custom plugins' path is the first one at prosody.paths.plugins
 	-- luacheck: ignore 512
 	for path in plugin_paths:gmatch("[^;]+") do
 		return path;
-- 
cgit v1.2.3


From 92fafa3343526ed26f66dc81d26167b7e0850f69 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Duarte?= <jvsDuarte08@gmail.com>
Date: Thu, 1 Aug 2019 04:33:05 -0700
Subject: util.startupt: I'm now using the resolve_relative_path function from
 util/paths at the setup_plugindir function

---
 util/startup.lua | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

(limited to 'util')

diff --git a/util/startup.lua b/util/startup.lua
index 4601bd85..4b3842bb 100644
--- a/util/startup.lua
+++ b/util/startup.lua
@@ -238,16 +238,8 @@ function startup.setup_plugindir()
 		CFG_PLUGINDIR = table.concat(custom_plugin_paths, path_sep)..path_sep..(CFG_PLUGINDIR or "plugins");
 		prosody.paths.plugins = CFG_PLUGINDIR;
 	end
-	-- Checks if installer_plugin_path is a relative paths and makes it an absolute path
-	if installer_plugin_path:sub(1,1) ~= "/" then
-		-- Works fine when executing prosody from source (configure and make only)
-		-- Probably wont be the best install directory, when using a package installation
-		local lfs_currentdir = require "lfs".currentdir();
-		local current_directory = lfs_currentdir;
-		-- Some normalization
-		installer_plugin_path = installer_plugin_path:gsub("^%.%"..dir_sep.."+", "");
-		installer_plugin_path = current_directory..dir_sep..installer_plugin_path;
-	end
+	local current_directory = require "lfs".currentdir();
+	installer_plugin_path = config.resolve_relative_path(current_directory, installer_plugin_path);
 	-- Checking if the folder exists. If it doesn't, we create it, but we need permissions to do so
 	if os.execute('[ -d "'..installer_plugin_path..'" ]') ~= 0 then
 		os.execute("mkdir "..installer_plugin_path);
-- 
cgit v1.2.3


From ded9e843e3c7f2fa463310ce15be271d252b76a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Duarte?= <jvsDuarte08@gmail.com>
Date: Thu, 1 Aug 2019 07:48:11 -0700
Subject: util.startupt: setup_plugindir now uses lfs.mkdir to check/create
 directories

---
 util/startup.lua | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'util')

diff --git a/util/startup.lua b/util/startup.lua
index 4b3842bb..8c6c8b99 100644
--- a/util/startup.lua
+++ b/util/startup.lua
@@ -240,10 +240,7 @@ function startup.setup_plugindir()
 	end
 	local current_directory = require "lfs".currentdir();
 	installer_plugin_path = config.resolve_relative_path(current_directory, installer_plugin_path);
-	-- Checking if the folder exists. If it doesn't, we create it, but we need permissions to do so
-	if os.execute('[ -d "'..installer_plugin_path..'" ]') ~= 0 then
-		os.execute("mkdir "..installer_plugin_path);
-	end
+	require "lfs".mkdir(installer_plugin_path)
 	-- Developers may have add these custom paths to their LUA_PATH/LUA_CPATH variables, before running prosody
 	-- Therefore, I'll just check if the paths we are about to add aren't already at package.(path/cpath)
 	if not string.match(package.path, installer_plugin_path) then
-- 
cgit v1.2.3


From a3f41c2b14b3776e6009d90d2fbc024b306620a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Duarte?= <jvsDuarte08@gmail.com>
Date: Thu, 1 Aug 2019 08:02:26 -0700
Subject: util.startup: Removed/rewrote comments at setup_plugindir

---
 util/startup.lua | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

(limited to 'util')

diff --git a/util/startup.lua b/util/startup.lua
index 8c6c8b99..e7107a9c 100644
--- a/util/startup.lua
+++ b/util/startup.lua
@@ -228,9 +228,7 @@ end
 function startup.setup_plugindir()
 	local custom_plugin_paths = config.get("*", "plugin_paths");
 	local installer_plugin_path = config.get("*", "installer_plugin_path") or "custom_plugins";
-	-- This variable separates different paths, like this "," here -> /usr;/home
 	local path_sep = package.config:sub(3,3);
-	-- This variable is the separator between directories, in a path, like the "/" here -> /home/path/to/somewhere
 	local dir_sep = package.config:sub(1,1);
 	if custom_plugin_paths then
 		-- path1;path2;path3;defaultpath...
@@ -241,18 +239,15 @@ function startup.setup_plugindir()
 	local current_directory = require "lfs".currentdir();
 	installer_plugin_path = config.resolve_relative_path(current_directory, installer_plugin_path);
 	require "lfs".mkdir(installer_plugin_path)
-	-- Developers may have add these custom paths to their LUA_PATH/LUA_CPATH variables, before running prosody
-	-- Therefore, I'll just check if the paths we are about to add aren't already at package.(path/cpath)
+	-- Checking for duplicates
+	-- The commands using luarocks need the path to the directory that has the /share and /lib folders.
 	if not string.match(package.path, installer_plugin_path) then
 		local lua_version = _VERSION:match(" (.+)$")
-		-- I'm assuming there's good reason not to hard code any separator
-		-- This next line is unnecessary, but I think it makes the code more readable and neat
 		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";
 		package.cpath = package.cpath..path_sep..installer_plugin_path..dir_sep.."lib"..sub_path.."?.lua";
 	end
-	-- The commands using luarocks need the path to the directory that has the /share and /lib folders.
 	CFG_PLUGINDIR = installer_plugin_path..path_sep..(CFG_PLUGINDIR or "plugins");
 	prosody.paths.plugins = CFG_PLUGINDIR;
 end
-- 
cgit v1.2.3


From d2fc41c9e754d20a7c432b10b2db4f840e8fae54 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Duarte?= <jvsDuarte08@gmail.com>
Date: Thu, 1 Aug 2019 08:08:06 -0700
Subject: util.startup: Directly calling lfs.currentdir instead of storing it
 in a local variable

---
 util/startup.lua | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'util')

diff --git a/util/startup.lua b/util/startup.lua
index e7107a9c..abf985f8 100644
--- a/util/startup.lua
+++ b/util/startup.lua
@@ -236,8 +236,7 @@ function startup.setup_plugindir()
 		CFG_PLUGINDIR = table.concat(custom_plugin_paths, path_sep)..path_sep..(CFG_PLUGINDIR or "plugins");
 		prosody.paths.plugins = CFG_PLUGINDIR;
 	end
-	local current_directory = require "lfs".currentdir();
-	installer_plugin_path = config.resolve_relative_path(current_directory, installer_plugin_path);
+	installer_plugin_path = config.resolve_relative_path(require "lfs".currentdir(), installer_plugin_path);
 	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.
-- 
cgit v1.2.3


From f27cd24e27134ff803e57768d1adac625f154162 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Duarte?= <jvsDuarte08@gmail.com>
Date: Thu, 1 Aug 2019 08:28:24 -0700
Subject: util.startup: setup_plugindir now also checks package.cpath for
 duplicates

---
 util/startup.lua | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'util')

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");
-- 
cgit v1.2.3


From 579bcb64d580b2e018f5aa4f647d23cb5b2da5e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Duarte?= <jvsDuarte08@gmail.com>
Date: Thu, 1 Aug 2019 09:12:28 -0700
Subject: util.paths: Added the function 'complement_lua_path'

---
 util/paths.lua | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

(limited to 'util')

diff --git a/util/paths.lua b/util/paths.lua
index 89f4cad9..a8d80a4c 100644
--- a/util/paths.lua
+++ b/util/paths.lua
@@ -41,4 +41,20 @@ function path_util.join(...)
 	return t_concat({...}, path_sep);
 end
 
+function path_util.complement_lua_path(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 path_sep = package.config:sub(3,3);
+	local dir_sep = package.config:sub(1,1);
+	local sub_path = dir_sep.."lua"..dir_sep..lua_version..dir_sep;
+	if not string.match(package.path, installer_plugin_path) then
+		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
+end
+
 return path_util;
-- 
cgit v1.2.3


From f088ddc713ec2b830b89546a4bf1b6a1218631e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Duarte?= <jvsDuarte08@gmail.com>
Date: Thu, 1 Aug 2019 09:22:50 -0700
Subject: util.startup: Now calls a function to complement lua's path/cpath

---
 util/startup.lua | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

(limited to 'util')

diff --git a/util/startup.lua b/util/startup.lua
index 6ba81819..e46f98c9 100644
--- a/util/startup.lua
+++ b/util/startup.lua
@@ -229,7 +229,6 @@ function startup.setup_plugindir()
 	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);
-	local dir_sep = package.config:sub(1,1);
 	if custom_plugin_paths then
 		-- path1;path2;path3;defaultpath...
 		-- luacheck: ignore 111
@@ -237,18 +236,8 @@ function startup.setup_plugindir()
 		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)
-	-- 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
-		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
+	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
-- 
cgit v1.2.3


From cc182d07959a8eb3a55f73a0039c42b256af671e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Duarte?= <jvsDuarte08@gmail.com>
Date: Thu, 1 Aug 2019 09:29:18 -0700
Subject: util.paths: Refactored a variable, to avoid shadowing

---
 util/paths.lua | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'util')

diff --git a/util/paths.lua b/util/paths.lua
index a8d80a4c..de63111e 100644
--- a/util/paths.lua
+++ b/util/paths.lua
@@ -45,15 +45,15 @@ function path_util.complement_lua_path(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 path_sep = package.config:sub(3,3);
+	local lua_path_sep = package.config:sub(3,3);
 	local dir_sep = package.config:sub(1,1);
 	local sub_path = dir_sep.."lua"..dir_sep..lua_version..dir_sep;
 	if not string.match(package.path, installer_plugin_path) then
-		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";
+		package.path = package.path..lua_path_sep..installer_plugin_path..dir_sep.."share"..sub_path.."?.lua";
+		package.path = package.path..lua_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";
+		package.cpath = package.cpath..lua_path_sep..installer_plugin_path..dir_sep.."lib"..sub_path.."?.lua";
 	end
 end
 
-- 
cgit v1.2.3


From 9ef4fbdbf875a09014d32caf8797402801095948 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Duarte?= <jvsDuarte08@gmail.com>
Date: Thu, 1 Aug 2019 09:29:40 -0700
Subject: util.startup: Reorganized code at setup_plugindir

---
 util/startup.lua | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'util')

diff --git a/util/startup.lua b/util/startup.lua
index e46f98c9..a77237d5 100644
--- a/util/startup.lua
+++ b/util/startup.lua
@@ -229,15 +229,15 @@ function startup.setup_plugindir()
 	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
-- 
cgit v1.2.3


From 68f40ef5ff40602553077c333e5f050b1edbb1c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Duarte?= <jvsDuarte08@gmail.com>
Date: Fri, 16 Aug 2019 09:26:36 -0700
Subject: util.startup: Changed the way util.paths.complement_lua_path was
 being accessed

---
 util/startup.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'util')

diff --git a/util/startup.lua b/util/startup.lua
index a77237d5..02e5f012 100644
--- a/util/startup.lua
+++ b/util/startup.lua
@@ -231,7 +231,7 @@ function startup.setup_plugindir()
 	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);
+	require"util.paths".complement_lua_path(installer_plugin_path);
 	if custom_plugin_paths then
 		-- path1;path2;path3;defaultpath...
 		-- luacheck: ignore 111
-- 
cgit v1.2.3


From bb07c44d5a0dbd76fc9c4650a8fdef383d127ad2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Duarte?= <jvsDuarte08@gmail.com>
Date: Fri, 16 Aug 2019 10:44:10 -0700
Subject: util.paths: Fixed file termination for package.cpath's extra path

---
 util/paths.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'util')

diff --git a/util/paths.lua b/util/paths.lua
index de63111e..c225108a 100644
--- a/util/paths.lua
+++ b/util/paths.lua
@@ -53,7 +53,7 @@ function path_util.complement_lua_path(installer_plugin_path)
 		package.path = package.path..lua_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..lua_path_sep..installer_plugin_path..dir_sep.."lib"..sub_path.."?.lua";
+		package.cpath = package.cpath..lua_path_sep..installer_plugin_path..dir_sep.."lib"..sub_path.."?.so";
 	end
 end
 
-- 
cgit v1.2.3


From ebfdb94d96f23b2953b69b0991985bf44691f747 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Duarte?= <jvsDuarte08@gmail.com>
Date: Fri, 16 Aug 2019 13:54:40 -0700
Subject: util.pluginloader: Added a new path to the variable local_names

---
 util/pluginloader.lua | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'util')

diff --git a/util/pluginloader.lua b/util/pluginloader.lua
index 9ab8f245..af0428c4 100644
--- a/util/pluginloader.lua
+++ b/util/pluginloader.lua
@@ -36,12 +36,13 @@ end
 
 local function load_resource(plugin, resource)
 	resource = resource or "mod_"..plugin..".lua";
-
+	local lua_version = _VERSION:match(" (.+)$");
 	local names = {
 		"mod_"..plugin..dir_sep..plugin..dir_sep..resource; -- mod_hello/hello/mod_hello.lua
 		"mod_"..plugin..dir_sep..resource;                  -- mod_hello/mod_hello.lua
 		plugin..dir_sep..resource;                          -- hello/mod_hello.lua
 		resource;                                           -- mod_hello.lua
+		"share"..dir_sep.."lua"..dir_sep..lua_version..dir_sep.."mod_"..plugin..dir_sep..resource;
 	};
 
 	return load_file(names);
-- 
cgit v1.2.3


From d323072816a3060dc0d77f7e58a3ebc3c2f90ff5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Duarte?= <jvsDuarte08@gmail.com>
Date: Fri, 16 Aug 2019 15:01:57 -0700
Subject: util/prosodyctl: Removed the check_flags and execute_command function

---
 util/prosodyctl.lua | 25 -------------------------
 1 file changed, 25 deletions(-)

(limited to 'util')

diff --git a/util/prosodyctl.lua b/util/prosodyctl.lua
index c6abc02f..316831a9 100644
--- a/util/prosodyctl.lua
+++ b/util/prosodyctl.lua
@@ -296,16 +296,6 @@ local function get_path_custom_plugins(plugin_paths)
 	end
 end
 
-local function check_flags(arg)
-	local flag = "--tree=";
-	-- There might not be any argument when the list command is calling this function
-	if arg[1] and arg[1]:sub(1, #flag) == flag then
-		local dir = arg[1]:match("=(.+)$")
-		return true, arg[#arg-1], dir;
-	end
-	return false, arg[#arg-1];
-end
-
 local function call_luarocks(operation, mod, dir)
 	if operation == "install" then
 		show_message("Installing %s at %s", mod, dir);
@@ -322,19 +312,6 @@ local function call_luarocks(operation, mod, dir)
 	end
 end
 
-local function execute_command(arg)
-	local operation = arg[#arg]
-	local tree, mod, dir = check_flags(arg);
-	if tree then
-		call_luarocks(operation, mod, dir);
-		return 0;
-	else
-		dir = get_path_custom_plugins(prosody.paths.plugins);
-		call_luarocks(operation, mod, dir);
-		return 0;
-	end
-end
-
 return {
 	show_message = show_message;
 	show_warning = show_message;
@@ -356,7 +333,5 @@ return {
 	stop = stop;
 	reload = reload;
 	get_path_custom_plugins = get_path_custom_plugins;
-	check_flags = check_flags;
 	call_luarocks = call_luarocks;
-	execute_command = execute_command;
 };
-- 
cgit v1.2.3


From 6ae5f04781c82e8064ceb9acc91ab9cfdb295969 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Duarte?= <jvsDuarte08@gmail.com>
Date: Fri, 16 Aug 2019 15:03:50 -0700
Subject: util/prosodyctl: call_luarocks now sets a directory variable itself

---
 util/prosodyctl.lua | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'util')

diff --git a/util/prosodyctl.lua b/util/prosodyctl.lua
index 316831a9..163658f3 100644
--- a/util/prosodyctl.lua
+++ b/util/prosodyctl.lua
@@ -296,7 +296,8 @@ local function get_path_custom_plugins(plugin_paths)
 	end
 end
 
-local function call_luarocks(operation, mod, dir)
+local function call_luarocks(mod, operation)
+	local dir = get_path_custom_plugins(prosody.paths.plugins);
 	if operation == "install" then
 		show_message("Installing %s at %s", mod, dir);
 	elseif operation == "remove" then
-- 
cgit v1.2.3