From 5999b1641c2d77b9adfe09acdf91b8cb48a2d7a9 Mon Sep 17 00:00:00 2001
From: monstermichl <vouillarmet.michel@gmail.com>
Date: Fri, 18 Feb 2022 08:17:27 +0100
Subject: [PATCH] Extend the GLPI installed check

Extending the GLPI installed check by making sure that not only the plugins folder is present. This way it is possible to install plugins before GLPI is started which makes it easier to build custom Docker images based on diouxx/glpi.
---
 glpi-start.sh | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/glpi-start.sh b/glpi-start.sh
index 92063aa..656a1e5 100644
--- a/glpi-start.sh
+++ b/glpi-start.sh
@@ -22,11 +22,13 @@ then
     echo -e "TLS_REQCERT\tnever" >> /etc/ldap/ldap.conf
 fi
 
-#Téléchargement et extraction des sources de GLPI
-if [ "$(ls ${FOLDER_WEB}${FOLDER_GLPI})" ];
+# Check if GLPI, but not only the plugins folder is present. This way it is possible to install plugins
+# before GLPI is started which makes it easier to build custom Docker images based on diouxx/glpi.
+if [ -d "${FOLDER_WEB}${FOLDER_GLPI}" ] && [ "$(ls ${FOLDER_WEB}${FOLDER_GLPI})" != "plugins" ];
 then
 	echo "GLPI is already installed"
 else
+	#Téléchargement et extraction des sources de GLPI
 	wget -P ${FOLDER_WEB} ${SRC_GLPI}
 	tar -xzf ${FOLDER_WEB}${TAR_GLPI} -C ${FOLDER_WEB}
 	rm -Rf ${FOLDER_WEB}${TAR_GLPI}