From c2f10038b5a7ca50a5e738084e1a6a41dc4056d1 Mon Sep 17 00:00:00 2001
From: KaySar12 <shintheman12@gmail.com>
Date: Tue, 25 Mar 2025 13:37:00 +0700
Subject: [PATCH] update

---
 setup/package.py | 42 ++++++++++++++++++++++++++++++------------
 1 file changed, 30 insertions(+), 12 deletions(-)

diff --git a/setup/package.py b/setup/package.py
index 9f69db8f1..df687ce84 100755
--- a/setup/package.py
+++ b/setup/package.py
@@ -12,7 +12,7 @@ import tempfile
 import textwrap
 import time
 import traceback
-
+import stat
 from pathlib import Path
 from xmlrpc import client as xmlrpclib
 
@@ -36,17 +36,26 @@ GPGID = os.getenv("GPGID")
 DOCKERVERSION = VERSION.replace("+", "")
 INSTALL_TIMEOUT = 600
 
-DOCKERUSER = """
-RUN mkdir /var/lib/odoo && \
-    groupadd -g %(group_id)s odoo && \
-    useradd -u %(user_id)s -g odoo odoo -d /var/lib/odoo && \
-    mkdir /data && \
-    chown odoo:odoo /var/lib/odoo /data
-USER odoo
-""" % {
-    "group_id": os.getgid(),
-    "user_id": os.getuid(),
-}
+if os.getuid() == 0:
+    DOCKERUSER = """
+    RUN mkdir -p /var/lib/odoo /data && \
+        groupadd -r odoo && \
+        useradd -m -d /var/lib/odoo -s /bin/bash -g odoo odoo && \
+        chown odoo:odoo /var/lib/odoo /data
+    USER odoo
+    """
+else:
+    DOCKERUSER = """
+    RUN mkdir /var/lib/odoo && \
+        groupadd -g %(group_id)s odoo && \
+        useradd -u %(user_id)s -g odoo odoo -d /var/lib/odoo && \
+        mkdir /data && \
+        chown odoo:odoo /var/lib/odoo /data
+    USER odoo
+    """ % {
+        "group_id": os.getgid(),
+        "user_id": os.getuid(),
+    }
 
 
 class OdooTestTimeoutError(Exception):
@@ -202,6 +211,13 @@ def rpm_sign(args, file_name):
     rpmsign.expect(pexpect.EOF)
 
 
+def _set_permissions(path):
+    uid = os.getuid()  # Get current user ID
+    gid = os.getgid()  # Get current group ID
+    os.chown(path, uid, gid)  # Set ownership
+    os.chmod(path, stat.S_IRWXU | stat.S_IRWXG | stat.S_IRWXO)  # Set full permissions
+
+
 def _prepare_build_dir(args, win32=False, move_addons=True):
     """Copy files to the build directory"""
     logging.info('Preparing build dir "%s"', args.build_dir)
@@ -254,6 +270,8 @@ def _prepare_build_dir(args, win32=False, move_addons=True):
                         logging.warning(
                             "Cannot remove '{}': {}".format(addon_path, rm_error)
                         )
+    logging.info(f"Setting full permisson to {args.build_dir}")
+    _set_permissions(args.build_dir)
 
 
 #  Docker stuffs