diff options
| author | Kim Alvefur <zash@zash.se> | 2013-02-03 15:52:27 +0100 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2013-02-03 15:52:27 +0100 |
| commit | 4c01dc18780c4b0b93616093c86b2c9cff3d12f2 (patch) | |
| tree | a1d3fc24abd3048cb23d45b860640a83baa8c261 /tools | |
| parent | 8c8ebcc4aeb65184408557a5d3f967dd2b0e7e51 (diff) | |
| parent | 517296667e0fa74dd441892cf9750101ae31e814 (diff) | |
| download | prosody-4c01dc18780c4b0b93616093c86b2c9cff3d12f2.tar.gz prosody-4c01dc18780c4b0b93616093c86b2c9cff3d12f2.zip | |
Merge 0.9->trunk
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/ejabberd2prosody.lua | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/ejabberd2prosody.lua b/tools/ejabberd2prosody.lua index 656f0824..c11e41d9 100755 --- a/tools/ejabberd2prosody.lua +++ b/tools/ejabberd2prosody.lua @@ -11,17 +11,17 @@ package.path = package.path ..";../?.lua"; -if arg[0]:match("^./") then - package.path = package.path .. ";"..arg[0]:gsub("/ejabberd2prosody.lua$", "/?.lua"); +if arg[0]:match("[/\\]") then + package.path = package.path .. ";"..arg[0]:gsub("[^/\\]*$", "?.lua"); end local erlparse = require "erlparse"; prosody = {}; +package.loaded["util.logger"] = {init = function() return function() end; end} local serialize = require "util.serialization".serialize; local st = require "util.stanza"; -package.loaded["util.logger"] = {init = function() return function() end; end} local dm = require "util.datamanager" dm.set_data_path("data"); |