Software /
code /
prosody
Diff
util/prosodyctl.lua @ 10046:0bc291a5734a
Merge 0.11->trunk
author | Kim Alvefur <zash@zash.se> |
---|---|
date | Mon, 10 Jun 2019 13:22:22 +0200 |
parent | 9781:161411a41377 |
child | 10132:b59535964e81 |
line wrap: on
line diff
--- a/util/prosodyctl.lua Mon Jun 10 12:58:00 2019 +0200 +++ b/util/prosodyctl.lua Mon Jun 10 13:22:22 2019 +0200 @@ -229,7 +229,8 @@ return true, signal.kill(pid, 0) == 0; end -local function start(source_dir) +local function start(source_dir, lua) + lua = lua and lua .. " " or ""; local ok, ret = isrunning(); if not ok then return ok, ret; @@ -238,9 +239,9 @@ return false, "already-running"; end if not source_dir then - os.execute("./prosody"); + os.execute(lua .. "./prosody"); else - os.execute(source_dir.."/../../bin/prosody"); + os.execute(lua .. source_dir.."/../../bin/prosody"); end return true; end