util.signal: Update version in header, and author's email

[prosody.git] / util / prosodyctl.lua

diff --git a/util/prosodyctl.lua b/util/prosodyctl.lua
index 3b523a786bd419800b9d261c05fcdf316f5baec6..e44c78d7d14f69c2b6feaf1c0aa3f717f1655cff 100644 (file)
--- a/util/prosodyctl.lua
+++ b/util/prosodyctl.lua
@@ -1,3 +1,11 @@
+-- Prosody IM
+-- 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.
+--
+
 
 local config = require "core.configmanager";
 local encodings = require "util.encodings";
@@ -9,6 +17,9 @@ local nodeprep, nameprep = stringprep.nodeprep, stringprep.nameprep;
 
 local io, os = io, os;
 local tostring, tonumber = tostring, tonumber;
+
+local CFG_SOURCEDIR = _G.CFG_SOURCEDIR;
+
 module "prosodyctl"
 
 function adduser(params)
@@ -55,7 +66,7 @@ function getpid()
        
        local file, err = io.open(pidfile);
        if not file then
-               return false, "pidfile-read-failed", ret;
+               return false, "pidfile-read-failed", err;
        end
        
        local pid = tonumber(file:read("*a"));
@@ -91,10 +102,8 @@ function start()
        end
        if not CFG_SOURCEDIR then
                os.execute("./prosody");
-       elseif CFG_SOURCEDIR:match("^/usr/local") then
-               os.execute("/usr/local/bin/prosody");
        else
-               os.execute("prosody");
+               os.execute(CFG_SOURCEDIR.."/../../bin/prosody");
        end
        return true;
 end