From 5fa113279266a8ae6ee440956f898016a90af924 Mon Sep 17 00:00:00 2001
From: Tho Ho <code@tho.email>
Date: Mon, 10 Oct 2022 14:30:21 +0800
Subject: [PATCH] Improve grep and seq matching

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

diff --git a/root/etc/cont-init.d/50-config b/root/etc/cont-init.d/50-config
index 6c1cfdb..0d21719 100644
--- a/root/etc/cont-init.d/50-config
+++ b/root/etc/cont-init.d/50-config
@@ -14,9 +14,9 @@ mkdir -p \
 if [[ ! -f "/config/www/.env" ]] || [[ ! -s "/config/www/.env" ]]; then
     cp /app/www/.env.example /config/www/.env
 
-    if ! grep -Fxq "DB_PORT=3306" /config/www/.env; then
+    if ! grep -xq "^DB_PORT=.*" /config/www/.env; then
         # add line DB_PORT=3306 to /config/www/.env because current /app/www/.env.example dont have it
-        sed -i "/DB_HOST=localhost/a DB_PORT=3306" /config/www/.env
+        sed -i "/^DB_HOST=.*/a DB_PORT=3306" /config/www/.env
         echo "**** Insert DB_PORT=3306 into /config/www/.env ****"
     fi
 fi
@@ -70,14 +70,13 @@ if [ "${DB_USER}" ];
 	then
 	echo "Running config - db_user set"
 	ESCAPED_PASSWORD=$(sed -E 's/('\'')/\\\1/g' <<< $DB_PASS)
-	sed -i "s/DB_HOST=localhost/DB_HOST=${DB_HOST}/g" /config/www/.env
-	sed -i "s/DB_DATABASE=database_database/DB_DATABASE=${DB_DATABASE}/g" /config/www/.env
-	sed -i "s/DB_USERNAME=database_username/DB_USERNAME=${DB_USER}/g" /config/www/.env
-	sed -i "s/DB_PASSWORD=database_user_password/DB_PASSWORD=${ESCAPED_PASSWORD}/g" /config/www/.env
+	sed -i "s/^DB_HOST=.*/DB_HOST=${DB_HOST}/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=${ESCAPED_PASSWORD}/g" /config/www/.env
 
-	if [ "${DB_PORT}" ];
-		then
-		sed -i "s/DB_PORT=3306/DB_PORT=${DB_PORT}/g" /config/www/.env
+	if [ -n "${DB_PORT}" ]; then
+		sed -i "s/^DB_PORT=.*/DB_PORT=${DB_PORT}/g" /config/www/.env
 	fi
 fi