From 6b9461c8a87195d3e77020c595c9663230ac823f Mon Sep 17 00:00:00 2001
From: Lachlan Wisdom <34927628+its-wizza@users.noreply.github.com>
Date: Tue, 13 Jan 2026 22:47:56 +1100
Subject: [PATCH] Simplify directory ownership changes in entrypoint

Refactor ownership change logic for directories.
---
 docker-entrypoint.sh | 17 +++--------------
 1 file changed, 3 insertions(+), 14 deletions(-)

diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh
index 796565d..7e0f4fa 100644
--- a/docker-entrypoint.sh
+++ b/docker-entrypoint.sh
@@ -2,12 +2,6 @@
 
 echo "Setting umask to ${UMASK}"
 umask ${UMASK}
-
-DOWNLOAD_DIR_CREATED=false
-if [ ! -d "${DOWNLOAD_DIR}" ]; then
-    DOWNLOAD_DIR_CREATED=true
-fi
-
 echo "Creating download directory (${DOWNLOAD_DIR}), state directory (${STATE_DIR}), and temp dir (${TEMP_DIR})"
 mkdir -p "${DOWNLOAD_DIR}" "${STATE_DIR}" "${TEMP_DIR}"
 
@@ -15,15 +9,10 @@ if [ `id -u` -eq 0 ] && [ `id -g` -eq 0 ]; then
     if [ "${UID}" -eq 0 ]; then
         echo "Warning: it is not recommended to run as root user, please check your setting of the UID environment variable"
     fi
-    
-    echo "Changing ownership of state directories to ${UID}:${GID}"
-    chown -R "${UID}":"${GID}" /app "${STATE_DIR}" "${TEMP_DIR}"
-    
-    if [ "${CHOWN_DOWNLOAD_DIR:-true}" != "false" ] || [ "${DOWNLOAD_DIR_CREATED}" = "true" ]; then
-        echo "Changing ownership of download directory (${DOWNLOAD_DIR})"
-        chown -R "${UID}:${GID}" "${DOWNLOAD_DIR}"
+    if [ "${CHOWN_DIRS:-true}" != "false" ]; then
+        echo "Changing ownership of download and state directories to ${UID}:${GID}"
+        chown -R "${UID}":"${GID}" /app "${DOWNLOAD_DIR}" "${STATE_DIR}" "${TEMP_DIR}"
     fi
-    
     echo "Running MeTube as user ${UID}:${GID}"
     exec su-exec "${UID}":"${GID}" python3 app/main.py
 else