From 7568dbc44f4dab61ee3fa46d597227376116336d Mon Sep 17 00:00:00 2001
From: yhaelopez <yhaelopez@gmail.com>
Date: Sun, 24 Dec 2023 12:55:39 -0700
Subject: [PATCH] cleanup

---
 odoo/Dockerfile      | 2 --
 odoo/clone-addons.sh | 4 +++-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/odoo/Dockerfile b/odoo/Dockerfile
index 2d9bb57..f9eb2a2 100644
--- a/odoo/Dockerfile
+++ b/odoo/Dockerfile
@@ -78,10 +78,8 @@ RUN python3 -m pip install -r /tmp/requirements.txt && \
 #    Odoo Enterprise + Third Party Addons    #
 #--------------------------------------------#
 # Create third-party-addons directory and clone them
-RUN mkdir -p ${THIRD_PARTY_ADDONS}
 COPY --chown=odoo:odoo ./odoo/clone-addons.sh /
 COPY --chown=odoo:odoo ./odoo/third-party-addons.txt /
-# RUN /clone-addons.sh && chown odoo:odoo -R ${THIRD_PARTY_ADDONS}
 RUN /clone-addons.sh
 
 #-----------------------#
diff --git a/odoo/clone-addons.sh b/odoo/clone-addons.sh
index 6f4443e..6fb577b 100755
--- a/odoo/clone-addons.sh
+++ b/odoo/clone-addons.sh
@@ -25,7 +25,7 @@ clone_and_copy_modules() {
 
     # Clone and copy logic for enterprise repository
     if [[ $repo_type == "enterprise" ]]; then
-        if [[ ! -d "${ENTERPRISE_ADDONS}" ]] && [ -n "$GITHUB_USER" ] && [ -n "$GITHUB_ACCESS_TOKEN" ]; then
+        if [ -n "$GITHUB_USER" ] && [ -n "$GITHUB_ACCESS_TOKEN" ]; then
             $clone_cmd --depth 1 --branch ${ODOO_TAG} --single-branch --no-tags
         fi
     else
@@ -84,6 +84,8 @@ expand_env_vars() {
 
 # Read the configuration file and process each line
 while IFS= read -r line; do
+    mkdir -p ${ENTERPRISE_ADDONS}
+    mkdir -p ${THIRD_PARTY_ADDONS}
     [[ -z "$line" || "$line" == \#* ]] && continue
     clone_and_copy_modules $(expand_env_vars "$line")
 done < "third-party-addons.txt"