tris/recoll
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

allow RECOLL_CONFTOP and RECOLL_CONFMID configuration variables to augment the confdir stack

Browse Source
This commit is contained in:
Jean-Francois Dockes 2013-09-27 13:05:03 +02:00
parent f49264a3f5
commit 2980af00e5
1 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/common/rclconfig.cpp
View File

@ -210,9 +210,31 @@ RclConfig::RclConfig(const string *argcnf)
o_localecharset.c_str())); o_localecharset.c_str()));
} }
const char *cp;
// Additional config directory, values override user ones
if ((cp = getenv("RECOLL_CONFTOP"))) {
m_cdirs.push_back(cp);
}
// User config
m_cdirs.push_back(m_confdir); m_cdirs.push_back(m_confdir);
// Additional config directory, overrides system's, overridden by user's
if ((cp = getenv("RECOLL_CONFMID"))) {
m_cdirs.push_back(cp);
}
// Base/installation config
m_cdirs.push_back(path_cat(m_datadir, "examples")); m_cdirs.push_back(path_cat(m_datadir, "examples"));
string cnferrloc = m_confdir + " or " + path_cat(m_datadir, "examples");
string cnferrloc;
for (vector<string>::const_iterator it = m_cdirs.begin();
it != m_cdirs.end(); it++) {
if (it != m_cdirs.begin())
cnferrloc += string(" or ");
cnferrloc += *it;
}
// Read and process "recoll.conf" // Read and process "recoll.conf"
if (!updateMainConfig()) if (!updateMainConfig())