diff options
| author | Kim Alvefur <zash@zash.se> | 2019-06-10 13:22:22 +0200 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2019-06-10 13:22:22 +0200 |
| commit | 0269157c4511472cf0bf377d84f6e99876f83d12 (patch) | |
| tree | 8cd84a76fb673cbfefa00ba1516bd16150f1c780 /util/prosodyctl.lua | |
| parent | a4764762b3dad679f40dadd6eb2eb31ea1d5cace (diff) | |
| parent | 9a5a3fd0f10693e6cba2779095398614eb94e68c (diff) | |
| download | prosody-0269157c4511472cf0bf377d84f6e99876f83d12.tar.gz prosody-0269157c4511472cf0bf377d84f6e99876f83d12.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 |