Merge remote-tracking branch 'upstream/master'

root/etc/s6-overlay/s6-rc.d/init-plex-chown/run

@@ -1,7 +1,11 @@
 #!/usr/bin/with-contenv bash
 # shellcheck shell=bash
 
-mkdir -p /run/plex-temp
+# remove plex temporary directory after unclean stop
+if [[ -d "${TMPDIR}" ]]; then
+	rm -rf "${TMPDIR}"
+fi
+mkdir -p ${TMPDIR}
 
 # create folders
 if [[ ! -d "${PLEX_MEDIA_SERVER_APPLICATION_SUPPORT_DIR}" ]]; then
@@ -40,7 +44,7 @@ if [[ -z ${LSIO_NON_ROOT_USER} ]]; then
 
     # permissions (non-recursive) on config root and folders
     lsiown abc:abc \
-        /run/plex-temp \
+        "${TMPDIR}" \
         /config \
         /config/*
 fi

root/etc/s6-overlay/s6-rc.d/init-plex-claim/run

@@ -19,8 +19,15 @@ if [[ ! -f "${PLEX_MEDIA_SERVER_PREFERENCES}" ]]; then
     export PLEX_MEDIA_SERVER_INFO_MODEL
     PLEX_MEDIA_SERVER_INFO_PLATFORM_VERSION=$(uname -r)
     export PLEX_MEDIA_SERVER_INFO_PLATFORM_VERSION
-    s6-setuidgid abc /bin/bash -c \
-        'LD_LIBRARY_PATH=/usr/lib/plexmediaserver:/usr/lib/plexmediaserver/lib /usr/lib/plexmediaserver/Plex\ Media\ Server' &
+
+    if [[ -z ${LSIO_NON_ROOT_USER} ]]; then
+        s6-setuidgid abc /bin/bash -c \
+            'LD_LIBRARY_PATH=/usr/lib/plexmediaserver:/usr/lib/plexmediaserver/lib /usr/lib/plexmediaserver/Plex\ Media\ Server' &
+    else
+        /bin/bash -c \
+            'LD_LIBRARY_PATH=/usr/lib/plexmediaserver:/usr/lib/plexmediaserver/lib /usr/lib/plexmediaserver/Plex\ Media\ Server' &
+    fi
+
     PID=$!
     echo "Waiting for Plex to generate its config"
     DBNAME="/config/Library/Application Support/Plex Media Server/Plug-in Support/Databases/com.plexapp.plugins.library.db-wal"