From b3b272859867ff184d622969f903ffcc60e7b906 Mon Sep 17 00:00:00 2001 From: Matthew Wild Date: Mon, 23 Nov 2009 17:31:49 +0000 Subject: util.dependencies: Add LuaFileSystem as a hard dependency --- util/dependencies.lua | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/util/dependencies.lua b/util/dependencies.lua index 5b07072f..a0f4e453 100644 --- a/util/dependencies.lua +++ b/util/dependencies.lua @@ -41,6 +41,15 @@ if not socket then fatal = true; end +local lfs, err = softreq "lfs" +if not lfs then + missingdep("luafilesystem", { ["luarocks"] = "luarocks install luafilesystem"; + ["Ubuntu 8.04 (Hardy)"] = "sudo apt-get install liblua5.1-luafilesystem0"; + ["Source"] = "http://www.keplerproject.org/luafilesystem/"; + }); + fatal = true; +end + local ssl = softreq "ssl" if not ssl then -- cgit v1.2.3 From 86de4680024ddfcaaaf38dee06a177efb5f3d352 Mon Sep 17 00:00:00 2001 From: Matthew Wild Date: Mon, 23 Nov 2009 18:51:54 +0000 Subject: util.dependencies: Clearer message, add homepages, etc. --- util/dependencies.lua | 27 ++++++++++++++++++++------- 1 file changed, 20 insertions(+), 7 deletions(-) diff --git a/util/dependencies.lua b/util/dependencies.lua index a0f4e453..6e0cfe14 100644 --- a/util/dependencies.lua +++ b/util/dependencies.lua @@ -30,23 +30,32 @@ 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"; }); + missingdep("luaexpat", { + ["Debian/Ubuntu"] = "sudo apt-get install liblua5.1-expat0"; + ["luarocks"] = "luarocks install luaexpat"; + ["Source"] = "http://www.keplerproject.org/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"; }); + missingdep("luasocket", { + ["Ubuntu"] = "sudo apt-get install liblua5.1-socket2"; + ["luarocks"] = "luarocks install luasocket"; + ["Source"] = "http://www.tecgraf.puc-rio.br/~diego/professional/luasocket/"; + }); fatal = true; end local lfs, err = softreq "lfs" if not lfs then - missingdep("luafilesystem", { ["luarocks"] = "luarocks install luafilesystem"; - ["Ubuntu 8.04 (Hardy)"] = "sudo apt-get install liblua5.1-luafilesystem0"; - ["Source"] = "http://www.keplerproject.org/luafilesystem/"; - }); + missingdep("luafilesystem", { + ["luarocks"] = "luarocks install luafilesystem"; + ["Debian/Ubuntu"] = "sudo apt-get install liblua5.1-luafilesystem0"; + ["Source"] = "http://www.keplerproject.org/luafilesystem/"; + }); fatal = true; end @@ -56,7 +65,11 @@ if not ssl then if config.get("*", "core", "run_without_ssl") then log("warn", "Running without SSL support because run_without_ssl is defined in the config"); else - missingdep("LuaSec", { ["Source"] = "http://www.inf.puc-rio.br/~brunoos/luasec/" }, "SSL/TLS support will not be available"); + missingdep("LuaSec", { + ["Debian/Ubuntu"] = "http://prosody.im/download/start#debian_and_ubuntu"; + ["luarocks"] = "luarocks install luasec"; + ["Source"] = "http://www.inf.puc-rio.br/~brunoos/luasec/"; + }, "SSL/TLS support will not be available"); end end -- cgit v1.2.3 From a918d40c046d0cc4576ece7799e3b8ffc69e31d4 Mon Sep 17 00:00:00 2001 From: Matthew Wild Date: Mon, 23 Nov 2009 19:59:32 +0000 Subject: util.dependencies: Missed a Debian/ --- util/dependencies.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/util/dependencies.lua b/util/dependencies.lua index 6e0cfe14..6decfba5 100644 --- a/util/dependencies.lua +++ b/util/dependencies.lua @@ -42,7 +42,7 @@ local socket = softreq "socket" if not socket then missingdep("luasocket", { - ["Ubuntu"] = "sudo apt-get install liblua5.1-socket2"; + ["Debian/Ubuntu"] = "sudo apt-get install liblua5.1-socket2"; ["luarocks"] = "luarocks install luasocket"; ["Source"] = "http://www.tecgraf.puc-rio.br/~diego/professional/luasocket/"; }); -- cgit v1.2.3 From 49916630b91195f385ab4c76ee089e29da5e21a8 Mon Sep 17 00:00:00 2001 From: Matthew Wild Date: Mon, 23 Nov 2009 20:18:04 +0000 Subject: util.datamanager: Replace popen(mkdir) with lfs.mkdir, keeping the just-in-time creation until we have the new datamanager API --- util/datamanager.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/util/datamanager.lua b/util/datamanager.lua index 4d07d6cc..bfd69ebf 100644 --- a/util/datamanager.lua +++ b/util/datamanager.lua @@ -15,13 +15,13 @@ local loadfile, setfenv, pcall = loadfile, setfenv, pcall; local log = require "util.logger".init("datamanager"); local io_open = io.open; local os_remove = os.remove; -local io_popen = io.popen; local tostring, tonumber = tostring, tonumber; local error = error; local next = next; local t_insert = table.insert; local append = require "util.serialization".append; local path_separator = "/"; if os.getenv("WINDIR") then path_separator = "\\" end +local lfs_mkdir = require "lfs".mkdir; module "datamanager" @@ -43,7 +43,7 @@ local _mkdir = {}; local function mkdir(path) path = path:gsub("/", path_separator); -- TODO as an optimization, do this during path creation rather than here if not _mkdir[path] then - local x = io_popen("mkdir \""..path.."\" 2>&1"):read("*a"); + lfs_mkdir(path); _mkdir[path] = true; end return path; -- cgit v1.2.3