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

util.dependencies: Use util.human.io.table to replace custom layout code

Browse source
This commit is contained in:
Matthew Wild 2020-06-04 17:30:44 +01:00
parent 366a099409
commit bec20ff0b4
1 changed files with 22 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

47
util/dependencies.lua
View file

@ -7,6 +7,7 @@
-- --
local function softreq(...) local ok, lib = pcall(require, ...); if ok then return lib; else return nil, lib; end end local function softreq(...) local ok, lib = pcall(require, ...); if ok then return lib; else return nil, lib; end end
local platform_table = require "util.human.io".table({ { width = 15, align = "right" }, { width = "100%" } });
-- Required to be able to find packages installed with luarocks -- Required to be able to find packages installed with luarocks
if not softreq "luarocks.loader" then -- LuaRocks 2.x if not softreq "luarocks.loader" then -- LuaRocks 2.x
@ -20,12 +21,8 @@ local function missingdep(name, sources, msg, err) -- luacheck: ignore err
print("Prosody was unable to find "..tostring(name)); print("Prosody was unable to find "..tostring(name));
print("This package can be obtained in the following ways:"); print("This package can be obtained in the following ways:");
print(""); print("");
local longest_platform = 0; for _, row in ipairs(sources) do
for platform in pairs(sources) do print(platform_table(row));
longest_platform = math.max(longest_platform, #platform);
end
for platform, source in pairs(sources) do
print("", platform..":"..(" "):rep(4+longest_platform-#platform)..source);
end end
print(""); print("");
print(msg or (name.." is required for Prosody to run, so we will now exit.")); print(msg or (name.." is required for Prosody to run, so we will now exit."));
@ -49,9 +46,9 @@ local function check_dependencies()
if not lxp then if not lxp then
missingdep("luaexpat", { missingdep("luaexpat", {
["Debian/Ubuntu"] = "sudo apt-get install lua-expat"; { "Debian/Ubuntu", "sudo apt-get install lua-expat" };
["luarocks"] = "luarocks install luaexpat"; { "luarocks", "luarocks install luaexpat" };
["Source"] = "http://matthewwild.co.uk/projects/luaexpat/"; { "Source", "http://matthewwild.co.uk/projects/luaexpat/" };
}, nil, err); }, nil, err);
fatal = true; fatal = true;
end end
@ -60,9 +57,9 @@ local function check_dependencies()
if not socket then if not socket then
missingdep("luasocket", { missingdep("luasocket", {
["Debian/Ubuntu"] = "sudo apt-get install lua-socket"; { "Debian/Ubuntu", "sudo apt-get install lua-socket" };
["luarocks"] = "luarocks install luasocket"; { "luarocks", "luarocks install luasocket" };
["Source"] = "http://www.tecgraf.puc-rio.br/~diego/professional/luasocket/"; { "Source", "http://www.tecgraf.puc-rio.br/~diego/professional/luasocket/" };
}, nil, err); }, nil, err);
fatal = true; fatal = true;
elseif not socket.tcp4 then elseif not socket.tcp4 then
@ -74,9 +71,9 @@ local function check_dependencies()
local lfs, err = softreq "lfs" local lfs, err = softreq "lfs"
if not lfs then if not lfs then
missingdep("luafilesystem", { missingdep("luafilesystem", {
["luarocks"] = "luarocks install luafilesystem"; { "luarocks", "luarocks install luafilesystem" };
["Debian/Ubuntu"] = "sudo apt-get install lua-filesystem"; { "Debian/Ubuntu", "sudo apt-get install lua-filesystem" };
["Source"] = "http://www.keplerproject.org/luafilesystem/"; { "Source", "http://www.keplerproject.org/luafilesystem/" };
}, nil, err); }, nil, err);
fatal = true; fatal = true;
end end
@ -85,9 +82,9 @@ local function check_dependencies()
if not ssl then if not ssl then
missingdep("LuaSec", { missingdep("LuaSec", {
["Debian/Ubuntu"] = "sudo apt-get install lua-sec"; { "Debian/Ubuntu", "sudo apt-get install lua-sec" };
["luarocks"] = "luarocks install luasec"; { "luarocks", "luarocks install luasec" };
["Source"] = "https://github.com/brunoos/luasec"; { "Source", "https://github.com/brunoos/luasec" };
}, "SSL/TLS support will not be available", err); }, "SSL/TLS support will not be available", err);
end end
@ -95,9 +92,9 @@ local function check_dependencies()
if not bit then if not bit then
missingdep("lua-bitops", { missingdep("lua-bitops", {
["Debian/Ubuntu"] = "sudo apt-get install lua-bitop"; { "Debian/Ubuntu", "sudo apt-get install lua-bitop" };
["luarocks"] = "luarocks install luabitop"; { "luarocks", "luarocks install luabitop" };
["Source"] = "http://bitop.luajit.org/"; { "Source", "http://bitop.luajit.org/" };
}, "WebSocket support will not be available", err); }, "WebSocket support will not be available", err);
end end
@ -105,8 +102,8 @@ local function check_dependencies()
if not encodings then if not encodings then
if err:match("module '[^']*' not found") then if err:match("module '[^']*' not found") then
missingdep("util.encodings", { missingdep("util.encodings", {
["Windows"] = "Make sure you have encodings.dll from the Prosody distribution in util/"; { "Windows", "Make sure you have encodings.dll from the Prosody distribution in util/" };
["GNU/Linux"] = "Run './configure' and 'make' in the Prosody source directory to build util/encodings.so"; { "GNU/Linux", "Run './configure' and 'make' in the Prosody source directory to build util/encodings.so" };
}); });
else else
print "***********************************" print "***********************************"
@ -123,8 +120,8 @@ local function check_dependencies()
if not hashes then if not hashes then
if err:match("module '[^']*' not found") then if err:match("module '[^']*' not found") then
missingdep("util.hashes", { missingdep("util.hashes", {
["Windows"] = "Make sure you have hashes.dll from the Prosody distribution in util/"; { "Windows", "Make sure you have hashes.dll from the Prosody distribution in util/" };
["GNU/Linux"] = "Run './configure' and 'make' in the Prosody source directory to build util/hashes.so"; { "GNU/Linux", "Run './configure' and 'make' in the Prosody source directory to build util/hashes.so" };
}); });
else else
print "***********************************" print "***********************************"