From a7409489150a78140afa387b8916811877bb33bb Mon Sep 17 00:00:00 2001
From: Alexandre <44178713+alexbelgium@users.noreply.github.com>
Date: Tue, 16 Jun 2026 21:32:10 +0200
Subject: [PATCH] Fix wger startup permissions and nginx init

---
 wger/rootfs/etc/cont-init.d/90-run.sh | 94 ++++++++++++++++++---------
 1 file changed, 63 insertions(+), 31 deletions(-)

diff --git a/wger/rootfs/etc/cont-init.d/90-run.sh b/wger/rootfs/etc/cont-init.d/90-run.sh
index 0e9f441465..8df6067557 100755
--- a/wger/rootfs/etc/cont-init.d/90-run.sh
+++ b/wger/rootfs/etc/cont-init.d/90-run.sh
@@ -1,5 +1,37 @@
 #!/usr/bin/env bashio
 
+set -u
+
+prepare_data_root() {
+    mkdir -p /data
+    chown wger /data || bashio::log.warning "Unable to set /data ownership to wger"
+    chmod a+rwx /data || bashio::log.warning "Unable to make /data writable"
+}
+
+prepare_writable_dir() {
+    local path="$1"
+
+    mkdir -p "$path"
+    chown -R wger "$path" || bashio::log.warning "Unable to set $path ownership to wger"
+    chmod -R a+rwX "$path" || bashio::log.warning "Unable to make $path writable"
+}
+
+move_persistent_dir() {
+    local source="$1"
+    local target="$2"
+
+    prepare_writable_dir "$target"
+
+    if [ -d "$source" ] && [ ! -L "$source" ]; then
+        if [ -n "$(ls -A "$source" 2> /dev/null)" ]; then
+            cp -rnf "$source"/. "$target"/
+        fi
+        rm -rf "$source"
+    fi
+
+    ln -sfn "$target" "$source"
+}
+
 ############################
 # Change database location #
 ############################
@@ -11,56 +43,56 @@ if [ "${#SETTINGS_FILES[@]}" -gt 0 ]; then
         sed -i "s|/home/wger/db/database.sqlite|/data/database.sqlite|g" "$settings_file"
     done
 else
-    bashio::log.warning "Unable to find settings.py containing database path under /home, skipping rewrite"
+    bashio::log.warning "Unable to find Python settings containing database path under /home, skipping rewrite"
 fi
 
 #####################
 # Adapt directories #
 #####################
 echo "... create directories"
-mkdir -p /data/static
-if [ -d /home/wger/static ] && [ ! -L /home/wger/static ]; then
-    if [ -n "$(ls -A /home/wger/static 2> /dev/null)" ]; then
-        cp -rnf /home/wger/static/* /data/static/
-    fi
-    rm -r /home/wger/static
-fi
-ln -sf /data/static /home/wger
-
-mkdir -p /data/media
-if [ -d /home/wger/media ] && [ ! -L /home/wger/media ]; then
-    if [ -n "$(ls -A /home/wger/media 2> /dev/null)" ]; then
-        cp -rnf /home/wger/media/* /data/media/
-    fi
-    rm -r /home/wger/media
-fi
-ln -sf /data/media /home/wger
+prepare_data_root
+move_persistent_dir /home/wger/static /data/static
+move_persistent_dir /home/wger/media /data/media
 
 #####################
 # Align permissions #
 #####################
 echo "... align permissions"
-chown -R wger /data
-chown -R wger /home/wger
-chmod -R 777 /data
+prepare_writable_dir /data/static
+prepare_writable_dir /data/media
+if [ -f /data/database.sqlite ]; then
+    chown wger /data/database.sqlite || bashio::log.warning "Unable to set /data/database.sqlite ownership to wger"
+    chmod a+rw /data/database.sqlite || bashio::log.warning "Unable to make /data/database.sqlite writable"
+fi
 
 echo "... add env variables"
 (
     set -o posix
     export -p
 ) > /data/env.sh
-while IFS= read -r line; do
-    [[ -z "$line" || "$line" =~ ^[[:space:]]*# ]] && continue
-    var="${line%%=*}"
-    sed -i "/^export[[:space:]]\+$var=/d" /data/env.sh
-    echo "export $line" >> /data/env.sh
-done < /.env
 
-chown wger /data/env.sh
-chmod +x /data/env.sh
+if [ -f /.env ]; then
+    while IFS= read -r line; do
+        [[ -z "$line" || "$line" =~ ^[[:space:]]*# ]] && continue
+        var="${line%%=*}"
+        [[ "$var" =~ ^[A-Za-z_][A-Za-z0-9_]*$ ]] || continue
+        sed -i "/^export[[:space:]]\+$var=/d" /data/env.sh
+        echo "export $line" >> /data/env.sh
+    done < /.env
+fi
+
+chown wger /data/env.sh || bashio::log.warning "Unable to set /data/env.sh ownership to wger"
+chmod 0644 /data/env.sh || bashio::log.warning "Unable to make /data/env.sh readable"
 
 bashio::log.info "Starting nginx"
-nginx || true &
-true
+mkdir -p /run/nginx /var/log/nginx
+if [ -f /run/nginx.pid ] && kill -0 "$(cat /run/nginx.pid)" 2> /dev/null; then
+    bashio::log.info "nginx is already running"
+elif nginx -t; then
+    nginx
+else
+    bashio::log.error "nginx configuration test failed"
+    exit 1
+fi
 
 bashio::log.info "Starting entrypoint"