prosody
92d86016e1e3
prosodyctl

Find changesets by keywords by author, files, the commit message, revision number or hash, or revset expression.

Software / code / prosody

Comparison

prosodyctl @ 7302:92d86016e1e3

Merge 0.10->trunk
author Matthew Wild <mwild1@gmail.com>
date Fri, 18 Mar 2016 14:03:35 +0000
parent 7269:cde4ef90cf3d
parent 7297:b34a42a10c9f
child 7313:316ca5c15255
comparison
equal deleted inserted replaced
7295:5f9c8204270f 7302:92d86016e1e3
9 9
10 -- prosodyctl - command-line controller for Prosody XMPP server 10 -- prosodyctl - command-line controller for Prosody XMPP server
11 11
12 -- Will be modified by configure script if run -- 12 -- Will be modified by configure script if run --
13 13
14 CFG_SOURCEDIR=os.getenv("PROSODY_SRCDIR"); 14 CFG_SOURCEDIR=CFG_SOURCEDIR or os.getenv("PROSODY_SRCDIR");
15 CFG_CONFIGDIR=os.getenv("PROSODY_CFGDIR"); 15 CFG_CONFIGDIR=CFG_CONFIGDIR or os.getenv("PROSODY_CFGDIR");
16 CFG_PLUGINDIR=os.getenv("PROSODY_PLUGINDIR"); 16 CFG_PLUGINDIR=CFG_PLUGINDIR or os.getenv("PROSODY_PLUGINDIR");
17 CFG_DATADIR=os.getenv("PROSODY_DATADIR"); 17 CFG_DATADIR=CFG_DATADIR or os.getenv("PROSODY_DATADIR");
18 18
19 -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- 19 -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
20 20
21 local function is_relative(path) 21 local function is_relative(path)
22 local path_sep = package.config:sub(1,1); 22 local path_sep = package.config:sub(1,1);