From fe7f30f0eef7bb79fedc8cd821c66baa1b9e6596 Mon Sep 17 00:00:00 2001
From: Étienne Loks <etienne.loks@iggdrasil.net>
Date: Wed, 20 May 2020 10:42:01 +0200
Subject: Fix installation script on celery no

---
 install/ishtar-install | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

(limited to 'install')

diff --git a/install/ishtar-install b/install/ishtar-install
index a45fcd8ba..208ac29f0 100755
--- a/install/ishtar-install
+++ b/install/ishtar-install
@@ -518,12 +518,8 @@ EOF
     echo "ISHTAR_WEBSERVER="$webserver >> $etc_path"config"
     echo "ISHTAR_LOCALE="$current_locale >> $etc_path"config"
     echo "ISHTAR_LIB_PATH="$full_install_path >> $etc_path"config"
-    if [ "$install_celery" == 'yes' ]; then
-        echo "USE_CELERY="$install_celery >> $etc_path"config"
-    fi
-    if [ "$install_libreoffice" == 'yes' ]; then
-        echo "USE_LIBREOFFICE=yes" >> $etc_path"config"
-    fi
+    echo "USE_CELERY="$install_celery >> $etc_path"config"
+    echo "USE_LIBREOFFICE=yes" >> $etc_path"config"
     echo "# settings added to all instances" >> $etc_path"extra_settings.py"
     echo ""
     cecho g "*******************************************************************************"
-- 
cgit v1.2.3