prosodyctl: Make the 'restart' command start Prosody even if it wasn't already running

diff --git a/prosodyctl b/prosodyctl
index cfc5ca77a979d74268a5483455984ec2da170462..94816c56da70eee9882195eabb35e215aa04a7b1 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,41 +31,18 @@ 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;
 
 config = require "core.configmanager"
 
 do
-       local filenames = {};
-       
-       local filename;
-       if arg[1] == "--config" and arg[2] then
-               table.insert(filenames, arg[2]);
-               table.remove(arg, 1); table.remove(arg, 1);
-               if CFG_CONFIGDIR then
-                       table.insert(filenames, CFG_CONFIGDIR.."/"..arg[2]);
-               end
-       else
-               for _, format in ipairs(config.parsers()) do
-                       table.insert(filenames, (CFG_CONFIGDIR or ".").."/prosody.cfg."..format);
-               end
-       end
-       for _,_filename in ipairs(filenames) do
-               filename = _filename;
-               local file = io.open(filename);
-               if file then
-                       file:close();
-                       CFG_CONFIGDIR = filename:match("^(.*)[\\/][^\\/]*$");
-                       break;
-               end
-       end
-       local ok, level, err = config.load(filename);
+       -- TODO: Check for other formats when we add support for them
+       -- Use lfs? Make a new conf/ dir?
+       local ok, level, err = config.load((CFG_CONFIGDIR or ".").."/prosody.cfg.lua");
        if not ok then
                print("\n");
                print("**************************");
@@ -331,7 +306,7 @@ function commands.adduser(arg)
        
        if ok then return 0; end
        
-       show_message(msg)
+       show_message(error_messages[msg])
        return 1;
 end