From 0c4a1d52616eaa8d03e4def1fc078a837a80f889 Mon Sep 17 00:00:00 2001 From: Marcel de Rooy Date: Wed, 15 Jun 2016 13:43:41 +0200 Subject: [PATCH] [SIGNED-OFF] Bug 16733: Adjust koha-indexer Content-Type: text/plain; charset="utf-8" [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 Signed-off-by: Owen Leonard --- debian/scripts/koha-indexer | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/debian/scripts/koha-indexer b/debian/scripts/koha-indexer index dd3f799..bf066d6 100755 --- a/debian/scripts/koha-indexer +++ b/debian/scripts/koha-indexer @@ -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 -x -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 -- 2.1.4