prosodyctl: Added support for --config command line argument, and multiple config...

[prosody.git] / prosodyctl

diff --git a/prosodyctl b/prosodyctl
index 05a71b38fdb481c7073ed4c324eb5b0b18415293..bbd051a860de4eaa838d034843d44cdccb1aaf8e 100755 (executable)
--- a/prosodyctl
+++ b/prosodyctl
@@ -1,7 +1,7 @@
 #!/usr/bin/env lua
 -- Prosody IM
--- Copyright (C) 2008-2010 Matthew Wild
--- Copyright (C) 2008-2010 Waqas Hussain
+-- Copyright (C) 2008-2009 Matthew Wild
+-- Copyright (C) 2008-2009 Waqas Hussain
 -- 
 -- This project is MIT/X11 licensed. Please see the
 -- COPYING file in the source package for more information.
@@ -11,20 +11,18 @@
 
 -- Will be modified by configure script if run --
 
-CFG_SOURCEDIR=os.getenv("PROSODY_SRCDIR");
+CFG_SOURCEDIR=nil;
 CFG_CONFIGDIR=os.getenv("PROSODY_CFGDIR");
-CFG_PLUGINDIR=os.getenv("PROSODY_PLUGINDIR");
+CFG_PLUGINDIR=nil;
 CFG_DATADIR=os.getenv("PROSODY_DATADIR");
 
--- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
+-- -- -- -- -- -- -- ---- -- -- -- -- -- -- -- --
 
--- Tell Lua where to find our libraries
 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
 
--- Substitute ~ with path to home directory in data path
 if CFG_DATADIR then
        if os.getenv("HOME") then
                CFG_DATADIR = CFG_DATADIR:gsub("^~", os.getenv("HOME"));
@@ -33,11 +31,9 @@ end
 
 -- Global 'prosody' object
 prosody = {
-       hosts = {};
-       events = require "util.events".new();
-       platform = "posix";
-       lock_globals = function () end;
-       unlock_globals = function () end;
+       hosts = {},
+       events = require "util.events".new(),
+       platform = "posix"
 };
 local prosody = prosody;