Bug 26265: (QA follow-up) Remove g option from regex, add few dirs

[koha-equinox.git] / debian / koha-common.postinst

diff --git a/debian/koha-common.postinst b/debian/koha-common.postinst
index 46bc087..fcdeaa9 100644 (file)
--- a/debian/koha-common.postinst
+++ b/debian/koha-common.postinst
@@ -136,7 +136,7 @@ log4perl_component()
     local config=$1
     local component=$2
 
-    if [ grep -q -x "log4perl.logger.$component" $config ]; then
+    if grep -q "log4perl.logger.$component" $config; then
         return 0
     else
         return 1
@@ -146,7 +146,7 @@ log4perl_component()
 # Take care of the instance's log4perl.conf file
 for site in $(koha-list); do
     log4perl_config="/etc/koha/sites/$site/log4perl.conf"
-    if [ !log4perl_component $log4perl_config "z3950" ]; then
+    if ! log4perl_component $log4perl_config "z3950"; then
         cat <<EOF >> $log4perl_config
 log4perl.logger.z3950 = WARN, Z3950
 log4perl.appender.Z3950=Log::Log4perl::Appender::File
@@ -159,7 +159,7 @@ log4perl.appender.Z3950.utf8=1
 EOF
     fi
 
-    if [ !log4perl_component $log4perl_config "api" ]; then
+    if ! log4perl_component $log4perl_config "api"; then
         cat <<EOF >> $log4perl_config
 log4perl.logger.api = WARN, API
 log4perl.appender.API=Log::Log4perl::Appender::File
@@ -175,7 +175,7 @@ done
 
 for site in $(koha-list); do
     log4perl_config="/etc/koha/sites/$site/log4perl.conf"
-    if [ !log4perl_component $log4perl_config "sip" ]; then
+    if ! log4perl_component $log4perl_config "sip"; then
         cat <<EOF >> $log4perl_config
 log4perl.logger.sip = DEBUG, SIP
 log4perl.appender.SIP=Log::Log4perl::Appender::File
@@ -189,6 +189,16 @@ EOF
     fi
 done
 
+for site in $(koha-list); do
+    kohaconfig="/etc/koha/sites/$site/koha-conf.xml"
+    logdir="$( xmlstarlet sel -t -v 'yazgfs/config/logdir' $kohaconfig )"
+    if [ "$logdir" != "" ] && [ "$logdir" != "0" ]; then
+        chown -R $site-koha:$site-koha $logdir
+    else
+        chown -R $site-koha:$site-koha /var/log/koha/$site
+    fi
+done
+
 # Bug 14106 - fix the modulePath of existing koha instances so that it'll
 # continue to work. This will only patch the files if the exact original string
 # that we're fixing them from is there, so we just run it every time. Maybe