From e2bd73702696e7a0ee4a06d41179242130355b17 Mon Sep 17 00:00:00 2001
From: Tho Ho <code@tho.email>
Date: Fri, 23 Dec 2022 00:27:42 +0800
Subject: [PATCH] sed and grep to support .env.sample upstream comments with #

---
 root/etc/cont-init.d/50-config | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/root/etc/cont-init.d/50-config b/root/etc/cont-init.d/50-config
index 3b934d8..5c249dc 100644
--- a/root/etc/cont-init.d/50-config
+++ b/root/etc/cont-init.d/50-config
@@ -82,17 +82,17 @@ fi
 if [[ -n "${DB_HOST}" ]]; then
     echo "Running config - DB_HOST set"
 
-    if ! grep -xq "^DB_PORT=.*" /config/www/.env; then
+    if ! grep -xqE "^[#]?DB_PORT=.*" /config/www/.env; then
         # add DB_PORT line to /config/www/.env because current /app/www/.env.example doesn't have it
-        sed -i "/^DB_HOST=.*/a DB_PORT=${DB_PORT}" /config/www/.env
+        sed -i -E "/^[#]?DB_HOST=.*/a DB_PORT=${DB_PORT}" /config/www/.env
         echo "**** Insert DB_PORT=${DB_PORT} into /config/www/.env ****"
     fi
 
-    sed -i "s/^DB_HOST=.*/DB_HOST=${DB_HOST}/g" /config/www/.env
-    sed -i "s/^DB_PORT=.*/DB_PORT=${DB_PORT}/g" /config/www/.env
-    sed -i "s/^DB_DATABASE=.*/DB_DATABASE=${DB_DATABASE}/g" /config/www/.env
-    sed -i "s/^DB_USERNAME=.*/DB_USERNAME=${DB_USER}/g" /config/www/.env
-    sed -i "s/^DB_PASSWORD=.*/DB_PASSWORD=${DB_PASS}/g" /config/www/.env
+    sed -i -E "s/^[#]?DB_HOST=.*/DB_HOST=${DB_HOST}/g" /config/www/.env
+    sed -i -E "s/^[#]?DB_PORT=.*/DB_PORT=${DB_PORT}/g" /config/www/.env
+    sed -i -E "s/^[#]?DB_DATABASE=.*/DB_DATABASE=${DB_DATABASE}/g" /config/www/.env
+    sed -i -E "s/^[#]?DB_USERNAME=.*/DB_USERNAME=${DB_USER}/g" /config/www/.env
+    sed -i -E "s/^[#]?DB_PASSWORD=.*/DB_PASSWORD=${DB_PASS}/g" /config/www/.env
 fi
 
 # set appurl