projects
/
prosody.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
b9084a1
)
Backout ae48bf828f21
author
Kim Alvefur
<zash@zash.se>
Sat, 21 Sep 2013 22:37:04 +0000
(
00:37
+0200)
committer
Kim Alvefur
<zash@zash.se>
Sat, 21 Sep 2013 22:37:04 +0000
(
00:37
+0200)
prosody
patch
|
blob
|
history
util/dependencies.lua
patch
|
blob
|
history
diff --git
a/prosody
b/prosody
index c86eea4238601726bff566c599507948988281c5..7c819214a996376282d31d3f1641fc2bea87d360 100755
(executable)
--- a/
prosody
+++ b/
prosody
@@
-16,9
+16,6
@@
CFG_CONFIGDIR=os.getenv("PROSODY_CFGDIR");
CFG_PLUGINDIR=os.getenv("PROSODY_PLUGINDIR");
CFG_DATADIR=os.getenv("PROSODY_DATADIR");
CFG_PLUGINDIR=os.getenv("PROSODY_PLUGINDIR");
CFG_DATADIR=os.getenv("PROSODY_DATADIR");
-package.path = "/Users/tfar/share/lua/5.1/?.lua;"..package.path;
-package.cpath = "/Users/tfar/lib/lua/5.1/?.so;"..package.cpath;
-
-- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
-- Tell Lua where to find our libraries
-- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
-- Tell Lua where to find our libraries
diff --git
a/util/dependencies.lua
b/util/dependencies.lua
index 9258be880f2f7367c075285f8417ae7027ba4aca..9371521caeca1817320af115c5d2160639b05ec2 100644
(file)
--- a/
util/dependencies.lua
+++ b/
util/dependencies.lua
@@
-11,9
+11,9
@@
module("dependencies", package.seeall)
function softreq(...) local ok, lib = pcall(require, ...); if ok then return lib; else return nil, lib; end end
-- Required to be able to find packages installed with luarocks
function softreq(...) local ok, lib = pcall(require, ...); if ok then return lib; else return nil, lib; end end
-- Required to be able to find packages installed with luarocks
-
--
if not softreq "luarocks.loader" then -- LuaRocks 2.x
-
--
softreq "luarocks.require"; -- LuaRocks <1.x
-
--
end
+if not softreq "luarocks.loader" then -- LuaRocks 2.x
+
softreq "luarocks.require"; -- LuaRocks <1.x
+end
function missingdep(name, sources, msg)
print("");
function missingdep(name, sources, msg)
print("");