From 574ae71c70e6d775bd0ef735b2c0f84addc23f95 Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Fri, 30 Mar 2018 12:12:50 +0200 Subject: prosodyctl: Increase robustness in luarocks version detection (fixes #1003) --- prosodyctl | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'prosodyctl') diff --git a/prosodyctl b/prosodyctl index d55ff5e7..6a2c3fa6 100755 --- a/prosodyctl +++ b/prosodyctl @@ -376,9 +376,15 @@ function commands.about(arg) 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"); -- cgit v1.2.3