Bug 22396: Make koha-sip set KOHA_HOME and KOHA_CONF correctly
authorTomas Cohen Arazi <tomascohen@theke.io>
Fri, 22 Feb 2019 15:00:35 +0000 (12:00 -0300)
committerroot <root@f1ebe1bec408>
Tue, 26 Feb 2019 12:33:27 +0000 (12:33 +0000)
This patch corrects a typo, and exports KOHA_CONF as other scripts do.

To test:
- Apply this patch
- Run:
  $ # in kohadevbox
  $ perl misc4dev/cp_debian_files.pl
- Try the new script
  $ sudo koha-sip --start kohadev
=> SUCCESS: tail -f /var/log/koha/kohadev/sip* doesn't show fatal errors
anymore
- Sign off :-D

Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>

debian/scripts/koha-sip

index ef26111..57ad478 100755 (executable)
@@ -64,7 +64,8 @@ start_sip()
     if ! is_sip_running $name; then
 
         adjust_paths_dev_install $name
-        export KOHA_CONF PERL5LIB
+        export KOHA_HOME PERL5LIB
+
         if [ "$DEV_INSTALL" = "" ]; then
             LIBDIR=$KOHA_HOME/lib
         else
@@ -276,6 +277,8 @@ if [ $# -gt 0 ]; then
 
         if is_instance $name; then
 
+            export KOHA_CONF="/etc/koha/sites/$name/koha-conf.xml"
+
             case $op in
                 "start")
                     start_sip $name