Comparison

prosodyctl @ 7299:b7dea8fd09c7

Merge
author Kim Alvefur <zash@zash.se>
date Fri, 18 Mar 2016 11:55:40 +0100
parent 7297:b34a42a10c9f
child 7302:92d86016e1e3
child 7311:e9526dd3e8fc
comparison
equal deleted inserted replaced
7298:7056bbaf81ee 7299:b7dea8fd09c7
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);