From a60da7a0c77568666ba5e674a8f2c5c976445d8f Mon Sep 17 00:00:00 2001
From: Robert Kaussow <mail@geeklabor.de>
Date: Thu, 3 Oct 2019 18:13:05 +0200
Subject: [PATCH] remove setup cli script from entrypoint

---
 overlay/usr/local/bin/entrypoint.sh | 35 ++++++++++++++++-------------
 1 file changed, 20 insertions(+), 15 deletions(-)

diff --git a/overlay/usr/local/bin/entrypoint.sh b/overlay/usr/local/bin/entrypoint.sh
index 8913f56..d415fd9 100755
--- a/overlay/usr/local/bin/entrypoint.sh
+++ b/overlay/usr/local/bin/entrypoint.sh
@@ -4,7 +4,7 @@
 /usr/local/bin/gomplate -V -o /var/www/app/data/config.php -f /etc/templates/config.php.tmpl
 /usr/local/bin/gomplate -V -o /var/www/app/constants.local.php -f /etc/templates/constants.local.php.tmpl
 
-if [ "${FRESHRSS_POSTGRES_SSL_ROOTCERT}" ]; then
+if [ "${FRESHRSS_POSTGRES_SSL_ROOTCERT}" ] && [ ! -f "/var/www/.postgresql/root.crt" ]; then
     ln -s "${FRESHRSS_POSTGRES_SSL_ROOTCERT}" /var/www/.postgresql/root.crt
 fi
 
@@ -20,27 +20,32 @@ if [ "${FRESHRSS_DEFAULT_USER}" ]; then
     UCREATE=$(/usr/bin/php ./cli/create-user.php --user "$FRESHRSS_DEFAULT_USER" --password "$FRESHRSS_DEFAULT_PASSWORD" 2>&1)
     if [ $? -ne 0 ]; then
         case "$UCREATE" in
-          *"username already taken"*) echo "Result: success" ;;
+          *"username already taken"*) ;;
           *)
           echo $UCREATE
           exit 1
           ;;
         esac
     fi 
+    echo "Result: success"
 
-    printf "\nEnsure FreshRSS is installed...\n"
-    INSTALL=$(/usr/bin/php ./cli/do-install.php --default_user "$FRESHRSS_DEFAULT_USER" 2>&1)
-    if [ $? -ne 0 ]; then
-        case "$INSTALL" in
-          *"already installed"*) 
-          /usr/bin/php ./cli/reconfigure.php --default_user "$FRESHRSS_DEFAULT_USER"
-          ;;
-          *)
-          echo $INSTALL
-          exit 1
-          ;;
-        esac
-    fi
+#    printf "\nEnsure FreshRSS is installed...\n"
+#    INSTALL=$(/usr/bin/php ./cli/do-install.php --default_user "$FRESHRSS_DEFAULT_USER" 2>&1)
+#    if [ $? -ne 0 ]; then
+#        case "$INSTALL" in
+#          *"already installed"*) 
+#          /usr/bin/php ./cli/reconfigure.php --default_user "$FRESHRSS_DEFAULT_USER"
+#          ;;
+#          *)
+#          echo $INSTALL
+#          exit 1
+#          ;;
+#        esac
+#    fi
+fi
+
+if [ -f "/var/www/app/data/do-install.txt" ]; then
+    rm -rf /var/www/app/data/do-install.txt
 fi
 
 exec supercronic -split-logs /etc/crontabs/nginx 1> /dev/null &