Merge with 0.5

Thu, 20 Aug 2009 16:30:32 +0100

author
Matthew Wild <mwild1@gmail.com>
date
Thu, 20 Aug 2009 16:30:32 +0100
changeset 1727
cbdc7bf61e0f
parent 1725
fb3137652ea6 (current diff)
parent 1726
85518cb866dd (diff)
child 1728
cb4c94b47d53
child 1758
5acbf4318715

Merge with 0.5

--- a/tools/ejabberd2prosody.lua	Thu Aug 20 13:57:50 2009 +0100
+++ b/tools/ejabberd2prosody.lua	Thu Aug 20 16:30:32 2009 +0100
@@ -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}

mercurial