From cac6b4dbac501d28e1beafdf9c226586d3e8d9a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Th=C3=A9o=20-=20Le=20Filament?= <theo@le-filament.com>
Date: Mon, 12 Aug 2024 19:34:15 +0200
Subject: [PATCH] build(get_addons): remove module directory when already
exists and use environment variable for path to the cloned repository
---
get_addons | 14 ++++++++++----
1 file changed, 10 insertions(+), 4 deletions(-)
diff --git a/get_addons b/get_addons
index 057f2ad..4451505 100644
--- a/get_addons
+++ b/get_addons
@@ -5,7 +5,7 @@ set -e
ODOO_ROOT_DIR=${ODOO_ROOT_DIR:-'/opt/odoo'}
SAVE_COMMITS_DIR=${SAVE_COMMITS_DIR:-'/opt/odoo_commits'}
SAVE_COMMITS_FILENAME=${SAVE_COMMITS_FILENAME:-'custom_addons'}
-TMP_REPO_PATH='/tmp/repo'
+TMP_REPO_PATH=${TEMP_REPO_PATH:-'/tmp/repo'}
save_commit() {
repo="$1"
@@ -25,20 +25,26 @@ modules="$@"
set +e
git clone --single-branch --branch "${ref}" --depth 1 "${repo}" "${TMP_REPO_PATH}"
-if [ "$?" -ne 0 ]; then
-git clone "${repo}" "${TMP_REPO_PATH}"
+if [ "$?" != 0 ]; then
+ git clone "${repo}" "${TMP_REPO_PATH}"
fi
set -e
git -C "${TMP_REPO_PATH}" checkout "${ref}"
-commit="$(git -C /tmp/repo rev-parse HEAD)"
+commit="$(git -C ${TMP_REPO_PATH} rev-parse HEAD)"
if [ -n "$modules" ]; then
for module in $modules; do
+ if [ -d "${ODOO_ROOT_DIR}/${dst}/${module}" ]; then
+ rm -r "${ODOO_ROOT_DIR}/${dst}/${module}"
+ fi
mv "${TMP_REPO_PATH}/${module}" "${ODOO_ROOT_DIR}/${dst}/"
save_commit "$repo" "$commit" "$module" "$dst"
done
else
module="$(basename $dst)"
+ if [ -d "${ODOO_ROOT_DIR}/${dst}" ]; then
+ rm -r "${ODOO_ROOT_DIR}/${dst}"
+ fi
mkdir -p "/${ODOO_ROOT_DIR}/${dst}"
mv ${TMP_REPO_PATH}/* "${ODOO_ROOT_DIR}/${dst}/"
save_commit "$repo" "$commit" "$module" "$dst"
--
GitLab