mirrors/prosody
1
0
Fork 0
mirror of https://github.com/bjc/prosody.git synced 2025-04-03 21:27:38 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

prosodyctl: Increase robustness in luarocks version detection (fixes #1003)

Browse source
This commit is contained in:
Kim Alvefur 2018-03-30 12:12:50 +02:00
parent 9974612a93
commit 574ae71c70
1 changed files with 9 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

12
prosodyctl
View file

@ -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");