Changeset

10168:f365f814d641

prosodyctl: Custom plugins paths are now retrieved by an helper function
author João Duarte <jvsDuarte08@gmail.com>
date Wed, 24 Jul 2019 11:26:29 -0700
parents 10167:f343ed1f02fd
children 10169:25deff8b2db4
files prosodyctl
diffstat 1 files changed, 3 insertions(+), 14 deletions(-) [+]
line wrap: on
line diff
--- a/prosodyctl	Wed Jul 24 11:20:35 2019 -0700
+++ b/prosodyctl	Wed Jul 24 11:26:29 2019 -0700
@@ -90,12 +90,7 @@
 		show_usage([[make]], [[Installs a prosody/luarocks plugin]]);
 		return 1;
 	end
-	local installer_plugin_path
-	-- I'm considering that we are using just one path to custom plugins, and it is the first in prosody.paths.plugins, for now
-	for path in prosody.paths.plugins:gmatch("[^;]+") do
-		installer_plugin_path = path
-		break
-	end
+	local installer_plugin_path = prosodyctl.get_path_custom_plugins(prosody.paths.plugins)
 	-- I'm considering this optional flag comes first
 	local flag = "--tree="
 	if arg[1] and arg[1]:sub(1, #flag) == flag then
@@ -120,10 +115,7 @@
 		return 1;
 	end
 	-- I'm considering that we are using just one path to custom plugins, and it is the first in prosody.paths.plugins, for now
-	for path in prosody.paths.plugins:gmatch("[^;]+") do
-		installer_plugin_path = path
-		break
-	end
+	local installer_plugin_path = prosodyctl.get_path_custom_plugins(prosody.paths.plugins)
 	local flag = "--tree="
 	-- I'm considering this optional flag comes first
 	if arg[1] and arg[1]:sub(1, #flag) == flag then
@@ -145,10 +137,7 @@
 		return 1;
 	end
 	-- I'm considering that we are using just one path to custom plugins, and it is the first in prosody.paths.plugins, for now
-	for path in prosody.paths.plugins:gmatch("[^;]+") do
-		installer_plugin_path = path
-		break
-	end
+	local installer_plugin_path = prosodyctl.get_path_custom_plugins(prosody.paths.plugins)
 	local flag = "--tree="
 	-- I'm considering this optional flag comes first
 	if arg[1] and arg[1]:sub(1, #flag) == flag then