Bug 16733: Adjust koha-indexer

[1] Add a call to the new adjust_paths_dev_install
[2] Differentiate location of rebuild_zebra.pl

NOTE: The scripts assume koha-functions.sh to be in /usr/share/koha/bin.
Finding a better location for this shell library may be hard.

Test plan:
Run koha-indexer for a regular package install or a dev install.

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Owen Leonard <oleonard@myacpl.org>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
This commit is contained in:
Marcel de Rooy 2016-06-15 13:43:41 +02:00 committed by Katrin Fischer
parent 399a7c5210
commit a42c3782c6
1 changed files with 9 additions and 5 deletions

View File

@ -177,12 +177,19 @@ while [ $# -gt 0 ]; do
done
# Optionally use alternative paths for a dev install
adjust_paths_dev_install $1
# Check if an alternate indexer has been set
if [ ! -z $ALTERNATE_INDEXER_DAEMON ]; then
INDEXER_DAEMON="$ALTERNATE_INDEXER_DAEMON"
else
# We default to rebuild_zebra.pl if no alternate indexer set
INDEXER_DAEMON="${KOHA_HOME}/bin/migration_tools/rebuild_zebra.pl"
if [ "$DEV_INSTALL" = "" ]; then
INDEXER_DAEMON="${KOHA_HOME}/bin/migration_tools/rebuild_zebra.pl"
else
INDEXER_DAEMON="${KOHA_HOME}/misc/migration_tools/rebuild_zebra.pl"
fi
fi
if [ $INDEXER_TIMEOUT -lt 1 ]; then
@ -195,10 +202,7 @@ if [ -z $INDEXER_PARAMS ]; then
INDEXER_PARAMS="-daemon -sleep $INDEXER_TIMEOUT"
fi
if [ -z $PERL5LIB ]; then
PERL5LIB="/usr/share/koha/lib"
fi
# PERL5LIB has been read from etc/default
export PERL5LIB
if [ $# -gt 0 ]; then