From c0912560a42d1ea8615a9806d3e92d743aed6bfb Mon Sep 17 00:00:00 2001 From: Matthew Wild Date: Thu, 22 Mar 2018 21:54:59 +0000 Subject: prosodyctl, util.prosodyctl: Pass source path as a parameter instead of global variable --- util/prosodyctl.lua | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'util') 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 -- cgit v1.2.3