util.prosodyctl: Saner determination of Prosody executable path

diff --git a/util/prosodyctl.lua b/util/prosodyctl.lua
index b24e194dad769d2fc5c9c46416f10670a1d7b0cb..e44c78d7d14f69c2b6feaf1c0aa3f717f1655cff 100644 (file)
--- a/util/prosodyctl.lua
+++ b/util/prosodyctl.lua
@@ -102,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