Bugzilla – Attachment 52466 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-rebuild-zebra
Bug-16733-Adjust-koha-rebuild-zebra.patch (text/plain), 1.92 KB, created by
Marcel de Rooy
on 2016-06-16 14:25:03 UTC
(
hide
)
Description:
Bug 16733: Adjust koha-rebuild-zebra
Filename:
MIME Type:
Creator:
Marcel de Rooy
Created:
2016-06-16 14:25:03 UTC
Size:
1.92 KB
patch
obsolete
>From 16c7595ac475b5088463297d5cacc3c2df4341bc Mon Sep 17 00:00:00 2001 >From: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> >Date: Wed, 15 Jun 2016 13:57:12 +0200 >Subject: [PATCH] Bug 16733: Adjust koha-rebuild-zebra >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 >[3] Replace a hardcoded path by $PERL5LIB > >Test plan: >Adjust a biblio record in package or dev install. >Run koha-rebuild-zebra -b -z for same instance. >Verify that the change has been indexed. > >Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> >--- > debian/scripts/koha-rebuild-zebra | 13 +++++++++++-- > 1 file changed, 11 insertions(+), 2 deletions(-) > >diff --git a/debian/scripts/koha-rebuild-zebra b/debian/scripts/koha-rebuild-zebra >index 0eb68d0..d131207 100755 >--- a/debian/scripts/koha-rebuild-zebra >+++ b/debian/scripts/koha-rebuild-zebra >@@ -56,12 +56,18 @@ run_rebuild_zebra() > [ "${full_reindex}" = "yes" ] || > [ "${force}" = "yes" ] ; then > >+ if [ "$DEV_INSTALL" = "" ]; then >+ KOHA_BINDIR=$KOHA_HOME/bin >+ else >+ KOHA_BINDIR=$KOHA_HOME/misc >+ fi >+ > # TODO: This comment is here to remind us that we should make > # rebuild_zebra.pl return error codes on failure > if sudo -u "$instancename-koha" -H \ >- env PERL5LIB=/usr/share/koha/lib \ >+ env PERL5LIB=$PERL5LIB \ > KOHA_CONF="/etc/koha/sites/$instancename/koha-conf.xml" \ >- /usr/share/koha/bin/migration_tools/rebuild_zebra.pl $@ ; then >+ $KOHA_BINDIR/migration_tools/rebuild_zebra.pl $@ ; then > return 0 > else > return 1 >@@ -148,6 +154,9 @@ while [ -n "$*" ]; do > shift > done > >+# Optionally use alternative paths for a dev install >+adjust_paths_dev_install $1 >+ > # Parse command line. > if [ $# -lt 1 ]; then > if [ "$quiet" = "no" ]; then >-- >1.7.10.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