Mercurial > lxmppd-hg-xmllex / file comparison
comparison: prosody
prosody
- changeset 2797
- 76777fee99b7
- parent 2789
- 2419ca0bfab3
- child 2877
- 1edeb8fe7d14
equal
deleted
inserted
replaced
| 2796:1e287badd033 | 2797:76777fee99b7 |
|---|---|
| 29 CFG_DATADIR = CFG_DATADIR:gsub("^~", os.getenv("HOME")); | 29 CFG_DATADIR = CFG_DATADIR:gsub("^~", os.getenv("HOME")); |
| 30 end | 30 end |
| 31 end | 31 end |
| 32 | 32 |
| 33 -- Required to be able to find packages installed with luarocks | 33 -- Required to be able to find packages installed with luarocks |
| 34 pcall(require, "luarocks.require") | 34 if not pcall(require, "luarocks.loader") then -- Try LuaRocks 2.x |
| 35 pcall(require, "luarocks.require") -- Try LuaRocks 1.x | |
| 36 end | |
| 35 | 37 |
| 36 -- Replace require with one that doesn't pollute _G | 38 -- Replace require with one that doesn't pollute _G |
| 37 do | 39 do |
| 38 local _realG = _G; | 40 local _realG = _G; |
| 39 local _real_require = require; | 41 local _real_require = require; |
