From 50c29d8d6f81669e301f348e2768d165d401261a Mon Sep 17 00:00:00 2001
From: hoangvv <shintheman12@gmail.com>
Date: Tue, 21 Jan 2025 11:42:05 +0700
Subject: [PATCH] update : refactor generating config

---
 Makefile             |  6 +++++-
 env.template         |  4 ++++
 extra-addons         |  2 +-
 setup/init_config.sh | 13 ++++++++-----
 4 files changed, 18 insertions(+), 7 deletions(-)
 create mode 100644 env.template

diff --git a/Makefile b/Makefile
index e69e0a075..b313a6ee1 100644
--- a/Makefile
+++ b/Makefile
@@ -1,3 +1,6 @@
+ifneq ("$(wildcard .env)", "")
+	include .env
+endif
 .SHELLFLAGS += ${SHELLFLAGS} -e
 PWD = $(shell pwd)
 UID = $(shell id -u)
@@ -23,6 +26,7 @@ CONTAINER_ID=${PROJECT}-${TAG}
 VERSION := community
 ADDONS=${PWD}/addons,${PWD}/odoo/addons,${PWD}/extra-addons
 BACKUP=${CDN}/raw/branch/main/backup/${VERSION}/odoo18-main_2025-01-15_08-05-47.zip
+
 ##### Native  Deployment#########
 install:
 	sudo apt update -y && \
@@ -41,7 +45,7 @@ download_backup:
 	${PWD}/setup/download_backup.sh $$LinkDB backup.zip
 gen_config:
 	$(MAKE) download_backup LINKDB=${BACKUP}
-	${PWD}/setup/init_config.sh --native ${ADDONS}
+	${PWD}/setup/init_config.sh --native ${ADDONS} ${DB_USER} ${DB_PASSWORD} ${DB_SERVER} ${DB_PORT}
 run_server:
 	${PYTHON} odoo-bin --config=${CONFIG} 
 run_test: 
diff --git a/env.template b/env.template
new file mode 100644
index 000000000..5549edf83
--- /dev/null
+++ b/env.template
@@ -0,0 +1,4 @@
+DB_USER=
+DB_PASSWORD= 
+DB_SERVER=
+DB_PORT=5432
\ No newline at end of file
diff --git a/extra-addons b/extra-addons
index 2594c7253..d8d6966b2 160000
--- a/extra-addons
+++ b/extra-addons
@@ -1 +1 @@
-Subproject commit 2594c72537fcfc6d8d41ac359d48c6d37f61947d
+Subproject commit d8d6966b2c86037b89304306d9880b65f8c65afa
diff --git a/setup/init_config.sh b/setup/init_config.sh
index 3df30a4e4..4c0335b5a 100755
--- a/setup/init_config.sh
+++ b/setup/init_config.sh
@@ -6,6 +6,8 @@ set -euo pipefail
 DEPLOY_PATH=$(pwd)/deployment
 SETUP_PATH=$(pwd)/setup
 
+
+
 PIP=$(pwd)/venv/bin/pip
 PYTHON=$(pwd)/venv/bin/python
 ODOO_ADDONS=${DEPLOY_PATH}/addons
@@ -194,9 +196,10 @@ Generate_Config_Docker(){
     Show 0 " Generate Config Complete"
 }
 Generate_Config_Native(){
-    # Load environment variables from .env file
-    Show 2 "Environment variables loaded:"
-    printenv | sort
+    DB_USER=${2:-}
+    DB_PASSWORD=${3:-}
+    DB_SERVER=${4:-}
+    DB_PORT=${5:-}
     ADDONS=${1:-}
     REPO_NAME=$(basename "$(git rev-parse --show-toplevel)" | sed -E 's/[.-]/_/g')
     USER="${REPO_NAME:-"default_repo"}" 
@@ -230,7 +233,7 @@ main(){
     # Check_Docker_Install
     case "$TYPE" in
     --native)
-    Generate_Config_Native $2
+    Generate_Config_Native $2 $3 $4 $5 $6
     ;;
     --docker)
     Generate_Config_Docker $2 $3 $4
@@ -242,4 +245,4 @@ main(){
     esac
 }
 
-main ${1:-} ${2:-} ${3:-} ${4:-}
+main "$@"