util.prosodyctl: Saner determination of Prosody executable path

Mon, 21 Dec 2009 16:52:12 +0000

author
Brian Cully <bjc@junctionnetworks.com>
date
Mon, 21 Dec 2009 16:52:12 +0000
changeset 2386
bfb093a0df1e
parent 2385
470004f8f4ed
child 2387
92264ee3a0e4

util.prosodyctl: Saner determination of Prosody executable path

util/prosodyctl.lua file | annotate | diff | comparison | revisions
--- a/util/prosodyctl.lua	Mon Dec 21 06:37:58 2009 +0500
+++ b/util/prosodyctl.lua	Mon Dec 21 16:52:12 2009 +0000
@@ -102,10 +102,8 @@
 	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

mercurial