mod_presence: Convert from Windows line endings

[prosody.git] / prosody

diff --git a/prosody b/prosody
index 290aa874a2fa3ef61f34b3dd2dd78703d19d0d63..c9c56a5d3cb96737fe47a09f4016381f0e9a7941 100755 (executable)
--- a/prosody
+++ b/prosody
@@ -17,10 +17,13 @@ CFG_DATADIR=os.getenv("PROSODY_DATADIR");
 -- -- -- -- -- -- -- ---- -- -- -- -- -- -- -- --
 
 if CFG_SOURCEDIR then
-       package.path = CFG_SOURCEDIR.."/?.lua;"..package.path
-       package.cpath = CFG_SOURCEDIR.."/?.so;"..package.cpath
+       package.path = CFG_SOURCEDIR.."/?.lua;"..package.path;
+       package.cpath = CFG_SOURCEDIR.."/?.so;"..package.cpath;
 end
 
+package.path = package.path..";"..(CFG_SOURCEDIR or ".").."/fallbacks/?.lua";
+package.cpath = package.cpath..";"..(CFG_SOURCEDIR or ".").."/fallbacks/?.so";
+
 if CFG_DATADIR then
        if os.getenv("HOME") then
                CFG_DATADIR = CFG_DATADIR:gsub("^~", os.getenv("HOME"));
@@ -231,6 +234,8 @@ end
 -- And lock now...
 prosody.lock_globals();
 
+prosody.start_time = os.time();
+
 eventmanager.fire_event("server-started");
 prosody.events.fire_event("server-started");