# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1522404770 -7200
# Node ID b7a22baaf55f7e984004d61fb91381584e7e7fd4
# Parent  d611c46c67875b352ef094cb13b48d4ba59e1351
prosodyctl: Increase robustness in luarocks version detection (fixes #1003)

diff -r d611c46c6787 -r b7a22baaf55f prosodyctl
--- a/prosodyctl	Thu Mar 29 16:57:18 2018 +0200
+++ b/prosodyctl	Fri Mar 30 12:12:50 2018 +0200
@@ -376,9 +376,15 @@
 		print("  "..path);
 	end
 	print("");
-	local luarocks_status = (pcall(require, "luarocks.loader") and "Installed ("..(package.loaded["luarocks.cfg"].program_version or "2.x+")..")")
-		or (pcall(require, "luarocks.require") and "Installed (1.x)")
-		or "Not installed";
+	local luarocks_status = "Not installed"
+	if pcall(require, "luarocks.loader") then
+		luarocks_status = "Installed (2.x+)";
+		if package.loaded["luarocks.cfg"] then
+			luarocks_status = "Installed ("..(package.loaded["luarocks.cfg"].program_version or "2.x+")..")";
+		end
+	elseif pcall(require, "luarocks.require") then
+		luarocks_status = "Installed (1.x)";
+	end
 	print("LuaRocks:        ", luarocks_status);
 	print("");
 	print("# Lua module versions");