Bugzilla – Attachment 60140 Details for
Bug 16749
Additional fixes for debian scripts
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 16749: Go with a boolean flag, we love booleans
Bug-16749-Go-with-a-boolean-flag-we-love-booleans.patch (text/plain), 2.04 KB, created by
Marcel de Rooy
on 2017-02-13 09:28:56 UTC
(
hide
)
Description:
Bug 16749: Go with a boolean flag, we love booleans
Filename:
MIME Type:
Creator:
Marcel de Rooy
Created:
2017-02-13 09:28:56 UTC
Size:
2.04 KB
patch
obsolete
>From 7effa92976b45d28e67ef0e260872f139ce90f12 Mon Sep 17 00:00:00 2001 >From: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> >Date: Mon, 13 Feb 2017 08:56:17 +0100 >Subject: [PATCH] Bug 16749: Go with a boolean flag, we love booleans >Content-Type: text/plain; charset=utf-8 > >As requested by Jonathan on comment 10 on Bugzilla and supported by Tomas, >we should use the dev_install entry in koha-conf as a boolean flag. >Since we already used it as a path, this patch is not too strict about it. >If the entry is not empty and not equal to "0", we will interpret it as >a true value. The path is taken from the intranetdir entry. > >Test plan: >[1] Copy debian/scripts/koha-functions.sh to /usr/share/koha/bin >[2] For a dev install: > Remove the dev install line, or toggle its value between empty string, > 0 or 1 and each time test stop/start koha-indexer. > Check the path to rebuild_zebra with ps aux|grep indexer. > If you have no entry, an empty entry or a zero, you should see a regular > path. > (Note: You can do something similar with koha-start-sip.) >[3] For a regular install: > Remove the dev install line. > Stop/start koha-indexer or koha-plack, and verify that it still works. > Add a dev_install line with 0, and repeat stop/start. > >Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> >--- > debian/scripts/koha-functions.sh | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > >diff --git a/debian/scripts/koha-functions.sh b/debian/scripts/koha-functions.sh >index 4c40ce5..1fdfe83 100755 >--- a/debian/scripts/koha-functions.sh >+++ b/debian/scripts/koha-functions.sh >@@ -224,10 +224,10 @@ adjust_paths_dev_install() > local instancename=$1 > local dev_install=$(run_safe_xmlstarlet $instancename dev_install) > >- if [ "$dev_install" != "" ]; then >+ if [ "$dev_install" != "" ] && [ "$dev_install" != "0" ]; then > DEV_INSTALL=1 >- KOHA_HOME=$dev_install >- PERL5LIB=$dev_install >+ KOHA_HOME=$(run_safe_xmlstarlet $instancename intranetdir) >+ PERL5LIB=$KOHA_HOME > else > DEV_INSTALL="" > fi >-- >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 16749
:
52561
|
55490
|
60064
|
60103
|
60106
|
60109
|
60110
|
60111
|
60112
|
60113
|
60114
|
60125
|
60126
|
60129
|
60130
|
60131
|
60132
|
60139
|
60140
|
60193
|
60194
|
60195
|
60196
|
60197
|
60335
|
60340
|
60343
|
60344
|
60345
|
60346
|
60347
|
60348
|
60349
|
60350