diff --git a/scripts/odoo_revision_18.0.20241125 b/scripts/odoo_revision_18.0.20241125 index fbcd0673..a39273bc 100755 --- a/scripts/odoo_revision_18.0.20241125 +++ b/scripts/odoo_revision_18.0.20241125 @@ -2,4 +2,4 @@ ODOO_REVISION=18.0.20241125 ODOO_REF=9cd3b8559fdba83f6f88f84dc1384e4bcb33bdc1 ODOO_ENTERPRISE_REF=8b22d1f390e0761a54a83828a782740def85bb64 ODOO_THEME_REF=5ce9cc6f2d112b37307fac2a3e2dd3960272a9b9 -ODOO_DOCKER_REF=odoo@sha256:55be8055bebb50cc6b9565e30ffb9a522b7c9b7c61a0558b005662ba9f0a06dc" \ No newline at end of file +ODOO_DOCKER_REF=odoo@sha256:55be8055bebb50cc6b9565e30ffb9a522b7c9b7c61a0558b005662ba9f0a06dc \ No newline at end of file diff --git a/task b/task index 706acf41..6713e7ec 100755 --- a/task +++ b/task @@ -1841,7 +1841,7 @@ function show-revision() { ODOO_VERSION=$(echo "$ODOO_REVISION" | cut -d'.' -f1-2) echo "Load refs for revision: $ODOO_REVISION" - export $(cat "scripts/odoo_revision_$ODOO_REVISION" | sed 's/#.*//g' | xargs) + source "scripts/odoo_revision_$ODOO_REVISION" echo "Odoo Ref: $ODOO_REF" echo "Odoo Enterprise Ref: $ODOO_ENTERPRISE_REF" @@ -1897,8 +1897,8 @@ function create-revision() { # Get git commit by date cd odoo - ODOO_REF=$(git rev-list -n 1 --before="$BEFORE_DATE" origin/$ODOO_VERSION) - git checkout "$ODOO_REF" + REF=$(git rev-list -n 1 --before="$BEFORE_DATE" origin/$ODOO_VERSION) + git checkout "$REF" cd .. cd enterprise ENTERPRISE_REF=$(git rev-list -n 1 --before="$BEFORE_DATE" origin/$ODOO_VERSION) @@ -1910,8 +1910,8 @@ function create-revision() { cd .. echo "Create revision: $REVISION" - export REVISION ODOO_REF ENTERPRISE_REF THEME_REF DOCKER_REF - envsubst '$REVISION $ODOO_REF $ENTERPRISE_REF $THEME_REF $DOCKER_REF' < templates/odoo_revision > scripts/odoo_revision_"$REVISION" + export REVISION REF ENTERPRISE_REF THEME_REF DOCKER_REF + envsubst '$REVISION $REF $ENTERPRISE_REF $THEME_REF $DOCKER_REF' < templates/odoo_revision > scripts/odoo_revision_"$REVISION" chmod +x scripts/odoo_revision_"$REVISION" echo "Checkout revision: $REVISION" diff --git a/templates/odoo_revision b/templates/odoo_revision index 7ca55c43..7516d1b0 100755 --- a/templates/odoo_revision +++ b/templates/odoo_revision @@ -1,5 +1,5 @@ ODOO_REVISION=$REVISION -ODOO_REF=$ODOO_REF +ODOO_REF=$REF ODOO_ENTERPRISE_REF=$ENTERPRISE_REF ODOO_THEME_REF=$THEME_REF ODOO_DOCKER_REF=$DOCKER_REF \ No newline at end of file