Friendlier messages on missing dependencies

diff --git a/main.lua b/main.lua
index 319c656556b266f852a96d278374e0061e8f8b2e..1a8c4295cf986b89683ef7f2381d0c27086e3e17 100644 (file)
--- a/main.lua
+++ b/main.lua
@@ -1,11 +1,10 @@
 pcall(require, "luarocks.require")
 
 local server = require "net.server"
-require "lxp"
-require "socket"
-pcall(require,"ssl") -- Optional
 local config = require "core.configmanager"
 
+require "util.dependencies"
+
 log = require "util.logger".init("general");
 
 do

diff --git a/util/dependencies.lua b/util/dependencies.lua
new file mode 100644 (file)
index 0000000..cb336e9
--- /dev/null
+++ b/util/dependencies.lua
@@ -0,0 +1,35 @@
+local fatal;
+
+local function softreq(...) local ok, lib =  pcall(require, ...); if ok then return lib; else return nil; end end
+
+local function missingdep(name, sources, msg)
+       print("Prosody was unable to find "..tostring(name));
+       print("This package can be obtained in the following ways:");
+       print("");
+       for k,v in pairs(sources) do
+               print("", k, v);
+       end
+       print(msg or (name.." is required for Prosody to run, so we will now exit."));
+end
+
+local lxp = softreq "lxp"
+
+if not lxp then
+       missingdep("luaexpat", { ["Ubuntu 8.04 (Hardy)"] = "sudo apt-get install liblua5.1-expat0"; ["luarocks"] = "luarocks install luaexpat"; });
+       fatal = true;
+end
+
+local socket = softreq "socket"
+
+if not socket then
+       missingdep("luasocket", { ["Ubuntu 8.04 (Hardy)"] = "sudo apt-get install liblua5.1-socket2"; ["luarocks"] = "luarocks install luasocket"; });
+       fatal = true;
+end
+       
+local ssl = softreq "ssl"
+
+if not ssl then
+       missingdep("LuaSec", { ["Source"] = "http://www.inf.puc-rio.br/~brunoos/luasec/" }, "SSL/TLS support will not be available");
+end
+
+if fatal then os.exit(1); end