From 49591fc29cdc675b5af1b602d59cd9d2b54c9568 Mon Sep 17 00:00:00 2001
From: sparklyballs <sparklyballs@gmail.com>
Date: Mon, 22 Aug 2016 13:43:05 +0100
Subject: [PATCH] move plex chown operation, and change test for it

---
 root/etc/cont-init.d/40-chown-files           | 23 +++++++++++++++++++
 root/etc/cont-init.d/50-chown-files           | 11 ---------
 .../{40-plex-update => 50-plex-update}        |  2 +-
 3 files changed, 24 insertions(+), 12 deletions(-)
 create mode 100644 root/etc/cont-init.d/40-chown-files
 delete mode 100644 root/etc/cont-init.d/50-chown-files
 rename root/etc/cont-init.d/{40-plex-update => 50-plex-update} (98%)

diff --git a/root/etc/cont-init.d/40-chown-files b/root/etc/cont-init.d/40-chown-files
new file mode 100644
index 0000000..8579706
--- /dev/null
+++ b/root/etc/cont-init.d/40-chown-files
@@ -0,0 +1,23 @@
+#!/usr/bin/with-contenv bash
+
+# check for preferences file, make lock file if not found and exit out
+if [ ! -e "/config/Library/Application Support/Plex Media Server/Preferences.xml" ]; then
+mkdir -p /config/Library
+touch /config/Library/linuxserver-chown.lock
+chown abc:abc \
+	/config/Library
+chown abc:abc \
+	/config/Library/linuxserver-chown.lock
+exit 0
+fi
+
+if [ ! -f "/config/Library/linuxserver-chown.lock" ]; then
+echo "Possible migration from existing version detected, please be patient while we chown existing files"
+echo "This could take some time"
+chown abc:abc -R \
+	/config/Library
+touch /config/Library/linuxserver-chown.lock
+chown abc:abc \
+	/config/Library/linuxserver-chown.lock
+echo "chown operation completed"
+fi
diff --git a/root/etc/cont-init.d/50-chown-files b/root/etc/cont-init.d/50-chown-files
deleted file mode 100644
index bef9d2a..0000000
--- a/root/etc/cont-init.d/50-chown-files
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/usr/bin/with-contenv bash
-
-# check for preferences file and exit out if not found
-[[ ! -e "/config/Library/Application Support/Plex Media Server/Preferences.xml" ]] && \
-	exit 0
-
-if [ ! -f "/config/Library/linuxserver-chown.lock" ]; then
-  find /config/Library ! \( -user abc -a -group abc \) -print0 | xargs -0 chown abc:abc
-  touch /config/Library/linuxserver-chown.lock
-  chown abc:abc /config/Library/linuxserver-chown.lock
-fi
diff --git a/root/etc/cont-init.d/40-plex-update b/root/etc/cont-init.d/50-plex-update
similarity index 98%
rename from root/etc/cont-init.d/40-plex-update
rename to root/etc/cont-init.d/50-plex-update
index 09bffce..c41a54b 100644
--- a/root/etc/cont-init.d/40-plex-update
+++ b/root/etc/cont-init.d/50-plex-update
@@ -9,7 +9,7 @@
 #######################################################
 
 # test for no version set or opt out for autoupdates
-[[ "$ADVANCED_DISABLEUPDATES" ]] || && \
+[[ "$ADVANCED_DISABLEUPDATES" ]] && \
 	exit 0
 
 # set header for no preferences/token message