aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrian Cully <bjc@junctionnetworks.com>2009-12-21 16:52:12 +0000
committerBrian Cully <bjc@junctionnetworks.com>2009-12-21 16:52:12 +0000
commit348b2532e33c295ca790e2e49d61eb1a3beeaec8 (patch)
treebe02dbc067ff69c820d980aad60707f7904248f1
parent281a8e651c36a5951138fbf77b158cafad7fa6c6 (diff)
downloadprosody-348b2532e33c295ca790e2e49d61eb1a3beeaec8.tar.gz
prosody-348b2532e33c295ca790e2e49d61eb1a3beeaec8.zip
util.prosodyctl: Saner determination of Prosody executable path
-rw-r--r--util/prosodyctl.lua4
1 files changed, 1 insertions, 3 deletions
diff --git a/util/prosodyctl.lua b/util/prosodyctl.lua
index b24e194d..e44c78d7 100644
--- 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