diff options
| -rwxr-xr-x | prosodyctl | 2 | ||||
| -rw-r--r-- | util/prosodyctl.lua | 8 |
2 files changed, 4 insertions, 6 deletions
@@ -219,7 +219,7 @@ function commands.start(arg) return 1; end - local ok, ret = prosodyctl.start(); + local ok, ret = prosodyctl.start(prosody.paths.source); if ok then local daemonize = config.get("*", "daemonize"); if daemonize == nil then diff --git a/util/prosodyctl.lua b/util/prosodyctl.lua index 0da28cfa..eee09762 100644 --- a/util/prosodyctl.lua +++ b/util/prosodyctl.lua @@ -24,8 +24,6 @@ local io, os = io, os; local print = print; local tonumber = tonumber; -local CFG_SOURCEDIR = _G.CFG_SOURCEDIR; - local _G = _G; local prosody = prosody; @@ -231,7 +229,7 @@ local function isrunning() return true, signal.kill(pid, 0) == 0; end -local function start() +local function start(source_dir) local ok, ret = isrunning(); if not ok then return ok, ret; @@ -239,10 +237,10 @@ local function start() if ret then return false, "already-running"; end - if not CFG_SOURCEDIR then + if not source_dir then os.execute("./prosody"); else - os.execute(CFG_SOURCEDIR.."/../../bin/prosody"); + os.execute(source_dir.."/../../bin/prosody"); end return true; end |