Bugzilla – Attachment 59147 Details for
Bug 16733
More flexible paths in debian scripts (for dev installs)
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 16733: Adjust koha-indexer
Bug-16733-Adjust-koha-indexer.patch (text/plain), 1.88 KB, created by
Jonathan Druart
on 2017-01-18 09:49:03 UTC
(
hide
)
Description:
Bug 16733: Adjust koha-indexer
Filename:
MIME Type:
Creator:
Jonathan Druart
Created:
2017-01-18 09:49:03 UTC
Size:
1.88 KB
patch
obsolete
>From 6bacdcd3af0d5f1717f1ced6062803a9d7255c18 Mon Sep 17 00:00:00 2001 >From: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> >Date: Wed, 15 Jun 2016 13:43:41 +0200 >Subject: [PATCH] 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> >--- > 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 01e544a..60b551a 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 -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
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 16733
:
52464
|
52465
|
52466
|
52467
|
52559
|
52560
|
53384
|
53385
|
53386
|
53387
|
55491
|
59146
| 59147 |
59148
|
59149
|
59150