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

Arrange so that we dont need recoll.conf.in any more.

Browse Source 
--HG--
branch : WINDOWSPORT
This commit is contained in:
Jean-Francois Dockes 2015-09-11 09:38:31 +02:00
parent bd58ffb920
commit 776f4369b9
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/common/rclconfig.cpp
View File

@ -1322,11 +1322,13 @@ string RclConfig::findFilter(const string &icmd) const
if (access(cmd.c_str(), X_OK) == 0) if (access(cmd.c_str(), X_OK) == 0)
return cmd; return cmd;
} }
// Filters dir as configuration parameter? // Filters dir as configuration parameter?
if (getConfParam(string("filtersdir"), cmd)) { if (getConfParam(string("filtersdir"), cmd)) {
cmd = path_cat(cmd, icmd); cmd = path_cat(cmd, icmd);
if (access(cmd.c_str(), X_OK) == 0) cmd = path_tildexpand(cmd);
return cmd; if (access(cmd.c_str(), X_OK) == 0)
return cmd;
} }
// Filters dir as datadir subdir. Actually the standard case, but // Filters dir as datadir subdir. Actually the standard case, but

11
src/sampleconf/recoll.conf.in
View File

@ -1,7 +1,7 @@
# (C) 2004 J.F.Dockes. License: GPL # (C) 2004 J.F.Dockes. License: GPL
# #
# Recoll default configuration file. This typically lives in # Recoll default configuration file. This typically lives in
# @prefix@/share/recoll/examples and provides default values. You can # $prefix/share/recoll/examples and provides default values. You can
# override selected parameters by adding assigments to # override selected parameters by adding assigments to
# ~/.recoll/recoll.conf (or $RECOLL_CONFDIR/recoll.conf) # ~/.recoll/recoll.conf (or $RECOLL_CONFDIR/recoll.conf)
# #
@ -199,12 +199,13 @@ maxfsoccuppc = 0
idxflushmb = 10 idxflushmb = 10
# Place to search for executable filters. If RECOLL_FILTERSDIR is set in # Place to search for executable filters. If RECOLL_FILTERSDIR is set in
# the environment, we use it instead # the environment, we use it instead. Defaults to $prefix/share/recoll/filters
filtersdir = @prefix@/share/recoll/filters # filtersdir = /path/to/my/filters
# Place to search for icons. The only reason to change this would be if you # Place to search for icons. The only reason to change this would be if you
# want to change the icons displayed in the result list # want to change the icons displayed in the result list.
iconsdir = @prefix@/share/recoll/images # Defaults to $prefix/share/recoll/images
# iconsdir = /path/to/my/icons
# Should we use the system's 'file -i' command as a final step in file type # Should we use the system's 'file -i' command as a final step in file type
# identification ? This may be useful, but will usually cause the # identification ? This may be useful, but will usually cause the