diff options
author | Kim Alvefur <zash@zash.se> | 2019-07-08 02:44:32 +0200 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2019-07-08 02:44:32 +0200 |
commit | f2b49140d8f9309bb3613effbef0739216ba7a9b (patch) | |
tree | 6b13265c066c8c32f4ed5d44fc9ca8421d118d06 /util/prosodyctl.lua | |
parent | e081fd664251a2eb7ab68262c2b8a3cad4b381c7 (diff) | |
parent | ae48864f9d7368bf2030d391d68d6363278202ea (diff) | |
download | prosody-f2b49140d8f9309bb3613effbef0739216ba7a9b.tar.gz prosody-f2b49140d8f9309bb3613effbef0739216ba7a9b.zip |
Merge 0.11->trunk
Diffstat (limited to 'util/prosodyctl.lua')
-rw-r--r-- | util/prosodyctl.lua | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/util/prosodyctl.lua b/util/prosodyctl.lua index 5f0c4d12..9b627bde 100644 --- a/util/prosodyctl.lua +++ b/util/prosodyctl.lua @@ -229,7 +229,8 @@ local function isrunning() 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 @@ local function start(source_dir) 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 |