Mercurial > prosody-hg
comparison tools/jabberd14sql2prosody.lua @ 6149:2ae6e9063e88
Merge 0.9->0.10
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Wed, 23 Apr 2014 00:22:36 +0200 |
| parents | bd0ff8ae98a8 852bd69ba148 |
| children | e270d22b11d9 |
comparison
equal
deleted
inserted
replaced
| 6146:ac4f8770d9aa | 6149:2ae6e9063e88 |
|---|---|
| 426 end | 426 end |
| 427 | 427 |
| 428 end | 428 end |
| 429 | 429 |
| 430 -- import modules | 430 -- import modules |
| 431 package.path = package.path.."..\?.lua;"; | 431 package.path = package.path..";../?.lua;"; |
| 432 | 432 |
| 433 local my_name = arg[0]; | 433 local my_name = arg[0]; |
| 434 if my_name:match("[/\\]") then | 434 if my_name:match("[/\\]") then |
| 435 package.path = package.path..";"..my_name:gsub("[^/\\]+$", "../?.lua"); | 435 package.path = package.path..";"..my_name:gsub("[^/\\]+$", "../?.lua"); |
| 436 package.cpath = package.cpath..";"..my_name:gsub("[^/\\]+$", "../?.so"); | 436 package.cpath = package.cpath..";"..my_name:gsub("[^/\\]+$", "../?.so"); |
