diff options
author | Matthew Wild <mwild1@gmail.com> | 2009-08-20 16:30:32 +0100 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2009-08-20 16:30:32 +0100 |
commit | ae3ee66fa190a3c0458ad00fc20470805b3dbf92 (patch) | |
tree | 77aa36934a8b2544b1d57851c707bab2864e7e0f | |
parent | 1e74c0bf848fb822c173b64adfda75c7ce098ce9 (diff) | |
parent | 8dca0cdd3edcc740bdacfa2a5a7e2b8662c58f42 (diff) | |
download | prosody-ae3ee66fa190a3c0458ad00fc20470805b3dbf92.tar.gz prosody-ae3ee66fa190a3c0458ad00fc20470805b3dbf92.zip |
Merge with 0.5
-rwxr-xr-x | tools/ejabberd2prosody.lua | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/tools/ejabberd2prosody.lua b/tools/ejabberd2prosody.lua index 4fef3f3a..c18056c1 100755 --- a/tools/ejabberd2prosody.lua +++ b/tools/ejabberd2prosody.lua @@ -9,9 +9,14 @@ +package.path = package.path ..";../?.lua"; + +if arg[0]:match("^./") then + package.path = package.path .. ";"..arg[0]:gsub("/ejabberd2prosody.lua$", "/?.lua"); +end + require "erlparse"; -package.path = package.path ..";../?.lua"; local serialize = require "util.serialization".serialize; local st = require "util.stanza"; package.loaded["util.logger"] = {init = function() return function() end; end} |