From bfef61c6a43742bf345f3545f408b29913b17b09 Mon Sep 17 00:00:00 2001
From: Alexandre <44178713+alexbelgium@users.noreply.github.com>
Date: Wed, 13 Sep 2023 11:37:15 +0200
Subject: [PATCH] Direct puid:pgid

---
 bazarr/rootfs/etc/cont-init.d/20-folders.sh   | 10 ++++----
 .../rootfs/etc/cont-init.d/20-folders.sh      |  2 +-
 emby/rootfs/etc/cont-init.d/20-folders.sh     | 24 +++++++++----------
 grav/rootfs/etc/cont-init.d/20-folders.sh     |  2 +-
 jackett/rootfs/etc/cont-init.d/20-folders.sh  |  6 ++---
 jellyfin/rootfs/etc/cont-init.d/20-folders.sh | 20 ++++++++--------
 lidarr/rootfs/etc/cont-init.d/20-folders.sh   |  4 ++--
 organizr/rootfs/etc/cont-init.d/00-folders.sh |  2 +-
 .../etc/cont-init.d/00-config_location.sh     |  2 +-
 .../rootfs/etc/cont-init.d/20-folders.sh      |  2 +-
 .../etc/cont-init.d/99-configuration.sh       |  6 ++---
 .../s6-overlay/s6-rc.d/init-alexbelgium/run   |  6 ++---
 plex/rootfs/etc/cont-init.d/21-folders.sh     |  2 +-
 .../rootfs/etc/cont-init.d/90-create_links.sh |  4 ++--
 prowlarr/rootfs/etc/cont-init.d/20-folders.sh |  4 ++--
 .../91-qbittorrent_configuration.sh           |  4 ++--
 radarr/rootfs/etc/cont-init.d/20-folders.sh   |  8 +++----
 .../etc/cont-init.d/00-config_location.sh     |  2 +-
 readarr/rootfs/etc/cont-init.d/20-folders.sh  |  8 +++----
 sonarr/rootfs/etc/cont-init.d/20-folders.sh   |  8 +++----
 .../rootfs/etc/cont-init.d/01-config.sh       |  6 ++---
 .../etc/cont-init.d/91-configuration.sh       |  2 +-
 22 files changed, 67 insertions(+), 67 deletions(-)

diff --git a/bazarr/rootfs/etc/cont-init.d/20-folders.sh b/bazarr/rootfs/etc/cont-init.d/20-folders.sh
index 322c1fb2d..81b2023f4 100755
--- a/bazarr/rootfs/etc/cont-init.d/20-folders.sh
+++ b/bazarr/rootfs/etc/cont-init.d/20-folders.sh
@@ -3,25 +3,25 @@
 if [ ! -d /share/storage/movies ]; then
     echo "Creating /share/storage/movies"
     mkdir -p /share/storage/movies
-    chown -R abc:abc /share/storage/movies
+    chown -R "$PUID:$PGID" /share/storage/movies
 fi
 
 if [ ! -d /share/storage/tv ]; then
     echo "Creating /share/storage/tv"
     mkdir -p /share/storage/tv
-    chown -R abc:abc /share/storage/tv
+    chown -R "$PUID:$PGID" /share/storage/tv
 fi
 
 if [ ! -d /share/downloads ]; then
     echo "Creating /share/downloads"
     mkdir -p /share/downloads
-    chown -R abc:abc /share/downloads
+    chown -R "$PUID:$PGID" /share/downloads
 fi
 
 if [ -d /config/bazarr ] && [ ! -d /config/addons_config/bazarr ]; then
     echo "Moving to new location /config/addons_config/bazarr"
     mkdir -p /config/addons_config/bazarr
-    chown -R abc:abc /config/addons_config/bazarr
+    chown -R "$PUID:$PGID" /config/addons_config/bazarr
     mv /config/bazarr/* /config/addons_config/bazarr/
     rm -r /config/bazarr
 fi
@@ -29,5 +29,5 @@ fi
 if [ ! -d /config/addons_config/bazarr ]; then
     echo "Creating /config/addons_config/bazarr"
     mkdir -p /config/addons_config/bazarr
-    chown -R abc:abc /config/addons_config/bazarr
+    chown -R "$PUID:$PGID" /config/addons_config/bazarr
 fi
diff --git a/calibre_web/rootfs/etc/cont-init.d/20-folders.sh b/calibre_web/rootfs/etc/cont-init.d/20-folders.sh
index 45f435b52..1674453d5 100755
--- a/calibre_web/rootfs/etc/cont-init.d/20-folders.sh
+++ b/calibre_web/rootfs/etc/cont-init.d/20-folders.sh
@@ -5,4 +5,4 @@ if [ ! -d /config/addons_config/calibre-web ]; then
     mkdir -p /config/addons_config/calibre-web
 fi
 
-chown -R abc:abc /config/addons_config/calibre-web
+chown -R "$PUID:$PGID" /config/addons_config/calibre-web
diff --git a/emby/rootfs/etc/cont-init.d/20-folders.sh b/emby/rootfs/etc/cont-init.d/20-folders.sh
index 90bc61989..e4f19bbf8 100755
--- a/emby/rootfs/etc/cont-init.d/20-folders.sh
+++ b/emby/rootfs/etc/cont-init.d/20-folders.sh
@@ -5,71 +5,71 @@ bashio::log.info "Updating folder structure and permission"
 
 echo "Internal location : /emby"
 mkdir -p /emby
-chown -R abc:abc /emby
+chown -R "$PUID:$PGID" /emby
 
 echo "Files location : /share/storage/tv"
 mkdir -p /share/storage/tv
-chown -R abc:abc /share/storage/tv
+chown -R "$PUID:$PGID" /share/storage/tv
 
 echo "Files location : /share/storage/movies"
 mkdir -p /share/storage/movies
-chown -R abc:abc /share/storage/movies
+chown -R "$PUID:$PGID" /share/storage/movies
 
 echo "Data location : /share/emby"
 mkdir -p /share/emby
-chown -R abc:abc /share/emby
+chown -R "$PUID:$PGID" /share/emby
 
 echo "Config location : /config/addons_config/emby"
 mkdir -p /config/addons_config/emby
-chown -R abc:abc /config/addons_config/emby
+chown -R "$PUID:$PGID" /config/addons_config/emby
 
 # links
 
 if [ ! -d /emby/cache ]; then
     echo "... link for /emby/cache"
     mkdir -p /share/emby/cache
-    chown -R abc:abc /share/emby/cache
+    chown -R "$PUID:$PGID" /share/emby/cache
     ln -s /share/emby/cache /emby/cache
 fi
 
 if [ ! -d /emby/config ]; then
     echo "Creating link for /emby/config"
     mkdir -p /config/emby
-    chown -R abc:abc /config/emby
+    chown -R "$PUID:$PGID" /config/emby
     ln -s /config/emby /emby/config
 fi
 
 if [ ! -d /emby/data ]; then
     echo "Creating link for /emby/data"
     mkdir -p /share/emby/data
-    chown -R abc:abc /share/emby/data
+    chown -R "$PUID:$PGID" /share/emby/data
     ln -s /share/emby/data /emby/data
 fi
 
 if [ ! -d /emby/logs ]; then
     echo "Creating link for /emby/logs"
     mkdir -p /share/emby/logs
-    chown -R abc:abc /share/emby/logs
+    chown -R "$PUID:$PGID" /share/emby/logs
     ln -s /share/emby/logs /emby/logs
 fi
 
 if [ ! -d /emby/metadata ]; then
     echo "Creating link for /emby/metadata"
     mkdir -p /share/emby/metadata
-    chown -R abc:abc /share/emby/metadata
+    chown -R "$PUID:$PGID" /share/emby/metadata
     ln -s /share/emby/metadata /emby/metadata
 fi
 
 if [ ! -d /emby/plugins ]; then
     echo "Creating link for /emby/plugins"
     mkdir -p /share/emby/plugins
-    chown -R abc:abc /share/emby/plugins
+    chown -R "$PUID:$PGID" /share/emby/plugins
     ln -s /share/emby/plugins /emby/plugins
 fi
 
 if [ ! -d /emby/root ]; then
     echo "Creating link for /emby/root"
     mkdir -p /share/emby/root
-    chown -R abc:abc /share/emby/root
+    chown -R "$PUID:$PGID" /share/emby/root
     ln -s /share/emby/root /emby/root
 fi
diff --git a/grav/rootfs/etc/cont-init.d/20-folders.sh b/grav/rootfs/etc/cont-init.d/20-folders.sh
index 008f964bf..a47f021b9 100755
--- a/grav/rootfs/etc/cont-init.d/20-folders.sh
+++ b/grav/rootfs/etc/cont-init.d/20-folders.sh
@@ -6,7 +6,7 @@ echo "Updating folders..."
 for FOLDERS in "/share/grav" "/app/grav-admin/backup"; do
     echo "... $FOLDERS"
     mkdir -p $FOLDERS
-    chown -R abc:abc $FOLDERS
+    chown -R "$PUID:$PGID" $FOLDERS
 done
 
 bashio::log.warning "If error of missing folder when loading addon, just restart"
diff --git a/jackett/rootfs/etc/cont-init.d/20-folders.sh b/jackett/rootfs/etc/cont-init.d/20-folders.sh
index f1ca4f470..22cfbb311 100755
--- a/jackett/rootfs/etc/cont-init.d/20-folders.sh
+++ b/jackett/rootfs/etc/cont-init.d/20-folders.sh
@@ -3,13 +3,13 @@
 if [ ! -d /share/downloads ]; then
     echo "Creating /share/downloads"
     mkdir -p /share/downloads
-    chown -R abc:abc /share/downloads
+    chown -R "$PUID:$PGID" /share/downloads
 fi
 
 if [ -d /config/Jackett ] && [ ! -d /config/addons_config/Jackett ]; then
     echo "Moving to new location /config/addons_config/Jackett"
     mkdir -p /config/addons_config/Jackett
-    chown -R abc:abc /config/addons_config/Jackett
+    chown -R "$PUID:$PGID" /config/addons_config/Jackett
     mv /config/Jackett/* /config/addons_config/Jackett/
     rm -r /config/Jackett
     rm -r /config/jackett
@@ -18,5 +18,5 @@ fi
 if [ ! -d /config/addons_config/Jackett ]; then
     echo "Creating /config/addons_config/Jackett"
     mkdir -p /config/addons_config/Jackett
-    chown -R abc:abc /config/addons_config/Jackett
+    chown -R "$PUID:$PGID" /config/addons_config/Jackett
 fi
diff --git a/jellyfin/rootfs/etc/cont-init.d/20-folders.sh b/jellyfin/rootfs/etc/cont-init.d/20-folders.sh
index 4e03067af..fcbed841f 100755
--- a/jellyfin/rootfs/etc/cont-init.d/20-folders.sh
+++ b/jellyfin/rootfs/etc/cont-init.d/20-folders.sh
@@ -21,25 +21,25 @@ fi
 if [ ! -d /jellyfin ]; then
     echo "Creating /jellyfin"
     mkdir -p /jellyfin
-    chown -R abc:abc /jellyfin
+    chown -R "$PUID:$PGID" /jellyfin
 fi
 
 if [ ! -d "$LOCATION"/tv ]; then
     echo "Creating $LOCATION/tv"
     mkdir -p "$LOCATION"/tv
-    chown -R abc:abc "$LOCATION"/tv
+    chown -R "$PUID:$PGID" "$LOCATION"/tv
 fi
 
 if [ ! -d "$LOCATION"/movies ]; then
     echo "Creating $LOCATION/movies"
     mkdir -p "$LOCATION"/movies
-    chown -R abc:abc "$LOCATION"/movies
+    chown -R "$PUID:$PGID" "$LOCATION"/movies
 fi
 
 if [ ! -d "$LOCATION" ]; then
     echo "Creating $LOCATION"
     mkdir -p "$LOCATION"
-    chown -R abc:abc "$LOCATION"
+    chown -R "$PUID:$PGID" "$LOCATION"
 fi
 
 # links
@@ -47,41 +47,41 @@ fi
 if [ ! -d /jellyfin/cache ]; then
     echo "Creating link for /jellyfin/cache"
     mkdir -p "$LOCATION"/cache
-    chown -R abc:abc "$LOCATION"/cache
+    chown -R "$PUID:$PGID" "$LOCATION"/cache
     ln -s "$LOCATION"/cache /jellyfin/cache
 fi
 
 if [ ! -d /jellyfin/data ]; then
     echo "Creating link for /jellyfin/data"
     mkdir -p "$LOCATION"/data
-    chown -R abc:abc "$LOCATION"/data
+    chown -R "$PUID:$PGID" "$LOCATION"/data
     ln -s "$LOCATION"/data /jellyfin/data
 fi
 
 if [ ! -d /jellyfin/log ]; then
     echo "Creating link for /jellyfin/log"
     mkdir -p "$LOCATION"/log
-    chown -R abc:abc "$LOCATION"/log
+    chown -R "$PUID:$PGID" "$LOCATION"/log
     ln -s "$LOCATION"/log /jellyfin/log
 fi
 
 if [ ! -d /jellyfin/metadata ]; then
     echo "Creating link for /jellyfin/metadata"
     mkdir -p "$LOCATION"/metadata
-    chown -R abc:abc "$LOCATION"/metadata
+    chown -R "$PUID:$PGID" "$LOCATION"/metadata
     ln -s "$LOCATION"/metadata /jellyfin/metadata
 fi
 
 if [ ! -d /jellyfin/plugins ]; then
     echo "Creating link for /jellyfin/plugins"
     mkdir -p "$LOCATION"/plugins
-    chown -R abc:abc "$LOCATION"/plugins
+    chown -R "$PUID:$PGID" "$LOCATION"/plugins
     ln -s "$LOCATION"/plugins /jellyfin/plugins
 fi
 
 if [ ! -d /jellyfin/root ]; then
     echo "Creating link for /jellyfin/root"
     mkdir -p "$LOCATION"/root
-    chown -R abc:abc "$LOCATION"/root
+    chown -R "$PUID:$PGID" "$LOCATION"/root
     ln -s "$LOCATION"/root /jellyfin/root
 fi
diff --git a/lidarr/rootfs/etc/cont-init.d/20-folders.sh b/lidarr/rootfs/etc/cont-init.d/20-folders.sh
index 31740be24..376488a07 100755
--- a/lidarr/rootfs/etc/cont-init.d/20-folders.sh
+++ b/lidarr/rootfs/etc/cont-init.d/20-folders.sh
@@ -4,13 +4,13 @@
 if [ ! -d /share/music ]; then
     echo "Creating /share/music"
     mkdir -p /share/music
-    chown -R abc:abc /share/music
+    chown -R "$PUID:$PGID" /share/music
 fi
 
 if [ ! -d /share/downloads ]; then
     echo "Creating /share/downloads"
     mkdir -p /share/downloads
-    chown -R abc:abc /share/downloads
+    chown -R "$PUID:$PGID" /share/downloads
 fi
 
 if [ -d /config/lidarr ] && [ ! -d /config/addons_config/lidarr ]; then
diff --git a/organizr/rootfs/etc/cont-init.d/00-folders.sh b/organizr/rootfs/etc/cont-init.d/00-folders.sh
index a27545499..943936202 100755
--- a/organizr/rootfs/etc/cont-init.d/00-folders.sh
+++ b/organizr/rootfs/etc/cont-init.d/00-folders.sh
@@ -4,5 +4,5 @@
 if [ ! -d /data/organizr ]; then
     echo "Creating /data/organizr"
     mkdir -p /data/organizr
-    chown -R abc:abc /data/organizr
+    chown -R "$PUID:$PGID" /data/organizr
 fi
diff --git a/overseerr/rootfs/etc/cont-init.d/00-config_location.sh b/overseerr/rootfs/etc/cont-init.d/00-config_location.sh
index 452ba6289..51916ec4a 100755
--- a/overseerr/rootfs/etc/cont-init.d/00-config_location.sh
+++ b/overseerr/rootfs/etc/cont-init.d/00-config_location.sh
@@ -5,7 +5,7 @@ CONFIG_LOCATION=$(bashio::config 'CONFIG_LOCATION')
 bashio::log.info "Config stored in $CONFIG_LOCATION"
 
 mkdir -p "$CONFIG_LOCATION"
-chown -R abc:abc "$CONFIG_LOCATION"
+chown -R "$PUID:$PGID" "$CONFIG_LOCATION"
 chmod -R 755 "$CONFIG_LOCATION"
 
 # shellcheck disable=SC2013
diff --git a/overseerr/rootfs/etc/cont-init.d/20-folders.sh b/overseerr/rootfs/etc/cont-init.d/20-folders.sh
index a94eef137..b24086b6d 100755
--- a/overseerr/rootfs/etc/cont-init.d/20-folders.sh
+++ b/overseerr/rootfs/etc/cont-init.d/20-folders.sh
@@ -15,4 +15,4 @@ for file in $(grep -Esril "/config/.config/yarn" /usr /etc /defaults); do
     sed -i "s=/config/.config/yarn=/config/addons_config/overseerr/yarn=g" "$file"
 done
 yarn config set global-folder /config/addons_config/overseerr/yarn
-chown -R abc:abc /config/addons_config/overseerr
+chown -R "$PUID:$PGID" /config/addons_config/overseerr
diff --git a/papermerge/rootfs/etc/cont-init.d/99-configuration.sh b/papermerge/rootfs/etc/cont-init.d/99-configuration.sh
index 7ec417a0c..d8a660221 100755
--- a/papermerge/rootfs/etc/cont-init.d/99-configuration.sh
+++ b/papermerge/rootfs/etc/cont-init.d/99-configuration.sh
@@ -29,19 +29,19 @@ bashio::log.info "Import dir set to $IMPORTDIR"
 #    echo "Creating /config"
 #    mkdir -p /config
 #fi
-#chown -R abc:abc /config
+#chown -R "$PUID:$PGID" /config
 
 if [ ! -d "$MEDIADIR" ]; then
     echo "Creating $MEDIADIR"
     mkdir -p "$MEDIADIR"
 fi
-chown -R abc:abc "$MEDIADIR"
+chown -R "$PUID:$PGID" "$MEDIADIR"
 
 if [ ! -d "$IMPORTDIR" ]; then
     echo "Creating $IMPORTDIR"
     mkdir -p "$IMPORTDIR"
 fi
-chown -R abc:abc "$IMPORTDIR"
+chown -R "$PUID:$PGID" "$IMPORTDIR"
 
 ##################
 # CONFIGURE IMAP #
diff --git a/piwigo/rootfs/etc/s6-overlay/s6-rc.d/init-alexbelgium/run b/piwigo/rootfs/etc/s6-overlay/s6-rc.d/init-alexbelgium/run
index e654eb2f2..ca62ed910 100755
--- a/piwigo/rootfs/etc/s6-overlay/s6-rc.d/init-alexbelgium/run
+++ b/piwigo/rootfs/etc/s6-overlay/s6-rc.d/init-alexbelgium/run
@@ -10,12 +10,12 @@
 if [ ! -d /share/piwigo ]; then
     echo "Creating /share/piwigo"
     mkdir -p /share/piwigo
-    chown -R abc:abc /share/piwigo
+    chown -R "$PUID:$PGID" /share/piwigo
 else
-    chown -R abc:abc /share/piwigo
+    chown -R "$PUID:$PGID" /share/piwigo
 fi
 
-mkdir -p /config/www/local 
+mkdir -p /config/www/local
 if [ ! -d /share/piwigo/config ] && [ -d /config/www/local/config ]; then
     echo "moving config folder"
     mv /config/www/local/config /share/piwigo
diff --git a/plex/rootfs/etc/cont-init.d/21-folders.sh b/plex/rootfs/etc/cont-init.d/21-folders.sh
index 224a316cd..676aa07f2 100755
--- a/plex/rootfs/etc/cont-init.d/21-folders.sh
+++ b/plex/rootfs/etc/cont-init.d/21-folders.sh
@@ -24,4 +24,4 @@ if [ ! -d "/config/Library/Application Support" ]; then
     ln -s "/share/plex/Plex Media Server" "/config/Library/Application Support"
 fi
 
-chown -R abc:abc /share/plex
+chown -R "$PUID:$PGID" /share/plex
diff --git a/plex/rootfs/etc/cont-init.d/90-create_links.sh b/plex/rootfs/etc/cont-init.d/90-create_links.sh
index 76515c838..11805f115 100755
--- a/plex/rootfs/etc/cont-init.d/90-create_links.sh
+++ b/plex/rootfs/etc/cont-init.d/90-create_links.sh
@@ -7,9 +7,9 @@
 if [ ! -d /share/plex ]; then
     echo "Creating /share/plex"
     mkdir -p /share/plex
-    chown -R abc:abc /share/plex
+    chown -R "$PUID:$PGID" /share/plex
 else
-    chown -R abc:abc /share/plex
+    chown -R "$PUID:$PGID" /share/plex
 fi
 
 if [ ! -d /share/plex/Library ]; then
diff --git a/prowlarr/rootfs/etc/cont-init.d/20-folders.sh b/prowlarr/rootfs/etc/cont-init.d/20-folders.sh
index d1887dc88..d1ca17245 100755
--- a/prowlarr/rootfs/etc/cont-init.d/20-folders.sh
+++ b/prowlarr/rootfs/etc/cont-init.d/20-folders.sh
@@ -3,7 +3,7 @@
 if [ -d /config/prowlarr ] && [ ! -d /config/addons_config/prowlarr ]; then
     echo "Moving to new location /config/addons_config/prowlarr"
     mkdir -p /config/addons_config/prowlarr
-    chown -R abc:abc /config/addons_config/prowlarr
+    chown -R "$PUID:$PGID" /config/addons_config/prowlarr
     mv /config/prowlarr/* /config/addons_config/prowlarr/
     rm -r /config/prowlarr
 fi
@@ -11,5 +11,5 @@ fi
 if [ ! -d /config/addons_config/prowlarr ]; then
     echo "Creating /config/addons_config/prowlarr"
     mkdir -p /config/addons_config/prowlarr
-    chown -R abc:abc /config/addons_config/prowlarr
+    chown -R "$PUID:$PGID" /config/addons_config/prowlarr
 fi
diff --git a/qbittorrent/rootfs/etc/cont-init.d/91-qbittorrent_configuration.sh b/qbittorrent/rootfs/etc/cont-init.d/91-qbittorrent_configuration.sh
index dc09079d9..176e84b02 100755
--- a/qbittorrent/rootfs/etc/cont-init.d/91-qbittorrent_configuration.sh
+++ b/qbittorrent/rootfs/etc/cont-init.d/91-qbittorrent_configuration.sh
@@ -58,7 +58,7 @@ fi
 
 # Create default location
 mkdir -p "$DOWNLOADS" || bashio::log.fatal "Error : folder defined in SavePath doesn't exist and can't be created. Check path"
-chown -R abc:abc "$DOWNLOADS" || bashio::log.fatal "Error, please check default save folder configuration in addon"
+chown -R "$PUID:$PGID" "$DOWNLOADS" || bashio::log.fatal "Error, please check default save folder configuration in addon"
 
 ##############
 # Avoid bugs #
@@ -148,7 +148,7 @@ if [ ! "$CUSTOMUI" = custom ]; then
     sed -i '/RootFolder/d' qBittorrent.conf
     rm -f -r /webui
     mkdir -p /webui
-    chown abc:abc /webui
+    chown "$PUID:$PGID" /webui
 fi
 
 # Install webui
diff --git a/radarr/rootfs/etc/cont-init.d/20-folders.sh b/radarr/rootfs/etc/cont-init.d/20-folders.sh
index 3785e80ea..9e5b03d57 100755
--- a/radarr/rootfs/etc/cont-init.d/20-folders.sh
+++ b/radarr/rootfs/etc/cont-init.d/20-folders.sh
@@ -3,19 +3,19 @@
 if [ ! -d /share/storage/movies ]; then
     echo "Creating /share/storage/movies"
     mkdir -p /share/storage/movies
-    chown -R abc:abc /share/storage/movies
+    chown -R "$PUID:$PGID" /share/storage/movies
 fi
 
 if [ ! -d /share/downloads ]; then
     echo "Creating /share/downloads"
     mkdir -p /share/downloads
-    chown -R abc:abc /share/downloads
+    chown -R "$PUID:$PGID" /share/downloads
 fi
 
 if [ -d /config/radarr ] && [ ! -d /config/addons_config/radarr ]; then
     echo "Moving to new location /config/addons_config/radarr"
     mkdir -p /config/addons_config/radarr
-    chown -R abc:abc /config/addons_config/radarr
+    chown -R "$PUID:$PGID" /config/addons_config/radarr
     mv /config/radarr/* /config/addons_config/radarr/
     rm -r /config/radarr
 fi
@@ -23,5 +23,5 @@ fi
 if [ ! -d /config/addons_config/radarr ]; then
     echo "Creating /config/addons_config/radarr"
     mkdir -p /config/addons_config/radarr
-    chown -R abc:abc /config/addons_config/radarr
+    chown -R "$PUID:$PGID" /config/addons_config/radarr
 fi
diff --git a/readarr/rootfs/etc/cont-init.d/00-config_location.sh b/readarr/rootfs/etc/cont-init.d/00-config_location.sh
index 398351481..5b89db0ce 100755
--- a/readarr/rootfs/etc/cont-init.d/00-config_location.sh
+++ b/readarr/rootfs/etc/cont-init.d/00-config_location.sh
@@ -11,7 +11,7 @@ CONFIG_LOCATION=$(bashio::config 'CONFIG_LOCATION')
 bashio::log.info "Config stored in $CONFIG_LOCATION"
 
 mkdir -p "$CONFIG_LOCATION"
-chown -R abc:abc "$CONFIG_LOCATION"
+chown -R "$PUID:$PGID" "$CONFIG_LOCATION"
 
 sed -i "s|/config/addons_config/readarr|$CONFIG_LOCATION|g" /etc/services.d/readarr/run
 sed -i "s|/config/addons_config/readarr|$CONFIG_LOCATION|g" /etc/cont-init.d/30-config
diff --git a/readarr/rootfs/etc/cont-init.d/20-folders.sh b/readarr/rootfs/etc/cont-init.d/20-folders.sh
index 971c49606..0128086fb 100755
--- a/readarr/rootfs/etc/cont-init.d/20-folders.sh
+++ b/readarr/rootfs/etc/cont-init.d/20-folders.sh
@@ -3,19 +3,19 @@
 if [ ! -d /share/storage/ebook ]; then
     echo "Creating /share/storage/ebook"
     mkdir -p /share/storage/ebook
-    chown -R abc:abc /share/storage/ebook
+    chown -R "$PUID:$PGID" /share/storage/ebook
 fi
 
 if [ ! -d /share/downloads ]; then
     echo "Creating /share/downloads"
     mkdir -p /share/downloads
-    chown -R abc:abc /share/downloads
+    chown -R "$PUID:$PGID" /share/downloads
 fi
 
 if [ -d /config/readarr ] && [ ! -d /config/addons_config/readarr ]; then
     echo "Moving to new location /config/addons_config/readarr"
     mkdir -p /config/addons_config/readarr
-    chown -R abc:abc /config/addons_config/readarr
+    chown -R "$PUID:$PGID" /config/addons_config/readarr
     mv /config/readarr/* /config/addons_config/readarr/
     rm -r /config/readarr
 fi
@@ -23,7 +23,7 @@ fi
 if [ ! -d /config/addons_config/readarr ]; then
     echo "Creating /config/addons_config/readarr"
     mkdir -p /config/addons_config/readarr
-    chown -R abc:abc /config/addons_config/readarr
+    chown -R "$PUID:$PGID" /config/addons_config/readarr
 fi
 
 if [ -d /config/addons_config/readarr/readarr ]; then
diff --git a/sonarr/rootfs/etc/cont-init.d/20-folders.sh b/sonarr/rootfs/etc/cont-init.d/20-folders.sh
index f48deff0d..a97820bf2 100755
--- a/sonarr/rootfs/etc/cont-init.d/20-folders.sh
+++ b/sonarr/rootfs/etc/cont-init.d/20-folders.sh
@@ -3,19 +3,19 @@
 if [ ! -d /share/storage/tv ]; then
     echo "Creating /share/storage/tv"
     mkdir -p /share/storage/tv
-    chown -R abc:abc /share/storage/tv
+    chown -R "$PUID:$PGID" /share/storage/tv
 fi
 
 if [ ! -d /share/downloads ]; then
     echo "Creating /share/downloads"
     mkdir -p /share/downloads
-    chown -R abc:abc /share/downloads
+    chown -R "$PUID:$PGID" /share/downloads
 fi
 
 if [ -d /config/sonarr ] && [ ! -d /config/addons_config/sonarr ]; then
     echo "Moving to new location /config/addons_config/sonarr"
     mkdir -p /config/addons_config/sonarr
-    chown -R abc:abc /config/addons_config/sonarr
+    chown -R "$PUID:$PGID" /config/addons_config/sonarr
     mv /config/sonarr/* /config/addons_config/sonarr/
     rm -r /config/sonarr
 fi
@@ -23,5 +23,5 @@ fi
 if [ ! -d /config/addons_config/sonarr ]; then
     echo "Creating /config/addons_config/sonarr"
     mkdir -p /config/addons_config/sonarr
-    chown -R abc:abc /config/addons_config/sonarr
+    chown -R "$PUID:$PGID" /config/addons_config/sonarr
 fi
diff --git a/transmission/rootfs/etc/cont-init.d/01-config.sh b/transmission/rootfs/etc/cont-init.d/01-config.sh
index 1c3fc90be..17d0a1c0f 100755
--- a/transmission/rootfs/etc/cont-init.d/01-config.sh
+++ b/transmission/rootfs/etc/cont-init.d/01-config.sh
@@ -29,7 +29,7 @@ fi
 echo "Updating folders"
 mkdir -p "$CONFIGDIR"
 mkdir -p /watch || true
-chown -R abc:abc "$CONFIGDIR"
+chown -R "$PUID:$PGID" "$CONFIGDIR"
 
 if ! bashio::fs.file_exists "$CONFIGDIR/settings.json"; then
     echo "Creating default config"
@@ -61,14 +61,14 @@ CONFIG=$(<$CONFIGDIR/settings.json)
 # Permissions
 echo "Updating permissions"
 mkdir -p "$download_dir"
-chown abc:abc "$download_dir"
+chown "$PUID:$PGID" "$download_dir"
 
 # if incomplete dir > 2, to allow both null and '', set it as existing
 if [ ${#incomplete_dir} -ge 2 ]; then
     echo "Incomplete dir set: $incomplete_dir"
     CONFIG=$(bashio::jq "${CONFIG}" ".\"incomplete-dir-enabled\"=true")
     mkdir -p "$incomplete_dir"
-    chown abc:abc "$incomplete_dir"
+    chown "$PUID:$PGID" "$incomplete_dir"
 else
     echo "Incomplete dir disabled"
     CONFIG=$(bashio::jq "${CONFIG}" ".\"incomplete-dir-enabled\"=false")
diff --git a/ubooquity/rootfs/etc/cont-init.d/91-configuration.sh b/ubooquity/rootfs/etc/cont-init.d/91-configuration.sh
index ca15ecd48..b10e7ceec 100755
--- a/ubooquity/rootfs/etc/cont-init.d/91-configuration.sh
+++ b/ubooquity/rootfs/etc/cont-init.d/91-configuration.sh
@@ -9,4 +9,4 @@ COMICS=$(jq ".comicsPaths[0].pathString" /config/addons_config/ubooquity/prefere
 BOOKS=$(jq ".booksPaths[0].pathString" /config/addons_config/ubooquity/preferences.json)
 
 mkdir -p "$FILES" "$COMICS" "$BOOKS" /config/addons_config/ubooquity || true
-chown -R abc:abc "$FILES" "$COMICS" "$BOOKS" /config/addons_config/ubooquity || true
+chown -R "$PUID:$PGID" "$FILES" "$COMICS" "$BOOKS" /config/addons_config/ubooquity || true