From e6ac1b48e77195e280ea9631a5dc185b8b1f49b6 Mon Sep 17 00:00:00 2001
From: casjay <git-admin@casjaysdev.com>
Date: Wed, 15 Mar 2023 22:58:38 -0400
Subject: [PATCH] =?UTF-8?q?=F0=9F=97=83=EF=B8=8F=20Committing=20everything?=
 =?UTF-8?q?=20that=20changed=20=F0=9F=97=83=EF=B8=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 rootfs/usr/local/bin/entrypoint.sh | 28 ++++++++++++++++------------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/rootfs/usr/local/bin/entrypoint.sh b/rootfs/usr/local/bin/entrypoint.sh
index ce4c95c..5897892 100755
--- a/rootfs/usr/local/bin/entrypoint.sh
+++ b/rootfs/usr/local/bin/entrypoint.sh
@@ -195,9 +195,9 @@ if [ -n "$DEFAULT_TEMPLATE_DIR" ]; then
         create_template_name="$(basename "$create_config_template")"
         if [ -d "$create_config_template" ]; then
           mkdir -p "/config/$create_template_name/"
-          cp -Rf "$create_config_template/." "/config/$create_template_name/" 2>/dev/null
+          [ -e "/config/$create_template_name" ] || cp -Rf "$create_config_template/." "/config/$create_template_name/" 2>/dev/null
         elif [ -e "$create_config_template" ]; then
-          cp -Rf "$create_config_template" "/config/$create_template_name" 2>/dev/null
+          [ -e "/config/$create_template_name" ] || cp -Rf "$create_config_template" "/config/$create_template_name" 2>/dev/null
         fi
       fi
     done
@@ -214,9 +214,9 @@ if [ -n "$DEFAULT_CONF_DIR" ]; then
       if [ -n "$create_config_template" ]; then
         if [ -d "$create_config_template" ]; then
           mkdir -p "/config/$create_config_name"
-          cp -Rf "$create_config_template/." "/config/$create_config_name/" 2>/dev/null
+          [ -e "/config/$create_config_name" ] || cp -Rf "$create_config_template/." "/config/$create_config_name/" 2>/dev/null
         elif [ -e "$create_config_template" ]; then
-          cp -Rf "$create_config_template" "/config/$create_config_name" 2>/dev/null
+          [ -e "/config/$create_config_name" ] || cp -Rf "$create_config_template" "/config/$create_config_name" 2>/dev/null
         fi
       fi
     done
@@ -233,9 +233,9 @@ if [ -d "/data" ]; then
       if [ -n "$create_data_template" ]; then
         if [ -d "$create_data_template" ]; then
           mkdir -p "/data/$create_data_name"
-          cp -Rf "$create_data_template/." "/data/$create_data_name/" 2>/dev/null
+          [ -e "/data/$create_data_name" ] || cp -Rf "$create_data_template/." "/data/$create_data_name/" 2>/dev/null
         elif [ -e "$create_data_template" ]; then
-          cp -Rf "$create_data_template" "/data/$create_data_name" 2>/dev/null
+          [ -e "/data/$create_data_name" ] || cp -Rf "$create_data_template" "/data/$create_data_name" 2>/dev/null
         fi
       fi
     done
@@ -263,13 +263,17 @@ if [ -d "/config" ]; then
 fi
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 # Copy html files
-if [ "$DATA_DIR_INITIALIZED" = "false" ] && [ -d "$DEFAULT_DATA_DIR/data/htdocs" ]; then
-  cp -Rf "$DEFAULT_DATA_DIR/data/htdocs/." "$WWW_ROOT_DIR/" 2>/dev/null
+if [ "$DATA_DIR_INITIALIZED" = "false" ] && [ -n "$WWW_ROOT_DIR" ]; then
+  if [ -d "$DEFAULT_DATA_DIR/data/htdocs" ]; then
+    [ "$(ls -A "$WWW_ROOT_DIR/" 2>/dev/null | wc -l)" -ne 0 ] || cp -Rf "$DEFAULT_DATA_DIR/data/htdocs/." "$WWW_ROOT_DIR/" 2>/dev/null
+  fi
 fi
-if [ -d "$DEFAULT_DATA_DIR/htdocs/www" ] && [ ! -d "$WWW_ROOT_DIR" ]; then
-  mkdir -p "$WWW_ROOT_DIR"
-  cp -Rf "$DEFAULT_DATA_DIR/htdocs/www/" "$WWW_ROOT_DIR"
-  [ -f "$WWW_ROOT_DIR/htdocs/www/server-health" ] || echo "OK" >"$WWW_ROOT_DIR/htdocs/www/server-health"
+if [ -n "$WWW_ROOT_DIR" ]; then
+  if [ -d "$DEFAULT_DATA_DIR/htdocs/www" ] && [ ! -d "$WWW_ROOT_DIR" ]; then
+    mkdir -p "$WWW_ROOT_DIR"
+    cp -Rf "$DEFAULT_DATA_DIR/htdocs/www/" "$WWW_ROOT_DIR"
+    [ -f "$WWW_ROOT_DIR/htdocs/www/server-health" ] || echo "OK" >"$WWW_ROOT_DIR/htdocs/www/server-health"
+  fi
 fi
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 [ -d "$SSL_DIR" ] || mkdir -p "$SSL_DIR"