From 63d9619659f56ebf54b43fc790189a3933968274 Mon Sep 17 00:00:00 2001 From: Marcel de Rooy Date: Mon, 13 Feb 2017 08:56:17 +0100 Subject: [PATCH] Bug 16749: Go with a boolean flag, we love booleans 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 Signed-off-by: Mirko Tietgen Tested in a package installation of master+16749 Signed-off-by: Jonathan Druart --- 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