From 7f37f3a0ad20dd16aef8b87e7e8e086558b6bf07 Mon Sep 17 00:00:00 2001
From: Patrick Griffis <tingping@tingping.se>
Date: Tue, 29 Sep 2015 17:48:12 -0400
Subject: [PATCH] Simply creation of the plex user

---
 PKGBUILD                  |  6 +++---
 plex-media-server.install | 31 ++-----------------------------
 2 files changed, 5 insertions(+), 32 deletions(-)

diff --git a/PKGBUILD b/PKGBUILD
index 99cf6e3..2e44392 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -24,6 +24,7 @@ backup=('etc/conf.d/plexmediaserver')
 install='plex-media-server.install'
 source=('plexmediaserver.conf.d'
         'plexmediaserver.service'
+        'plex.sysusers'
         'terms.txt')
 source_arm=("https://downloads.plex.tv/plex-media-server/${pkgver}-${_pkgsum}/PlexMediaServer-${pkgver}-${_pkgsum}-arm.spk")
 source_armv7h=("https://downloads.plex.tv/plex-media-server/${pkgver}-${_pkgsum}/PlexMediaServer-${pkgver}-${_pkgsum}-arm7.spk")
@@ -31,6 +32,7 @@ source_i686=("https://downloads.plex.tv/plex-media-server/${pkgver}-${_pkgsum}/p
 source_x86_64=("https://downloads.plex.tv/plex-media-server/${pkgver}-${_pkgsum}/plexmediaserver-${pkgver}-${_pkgsum}.x86_64.rpm")
 sha256sums=('7ab1ee8da9012d257b7f473fb79d76b201ca592cbe3722f977a43b58bfad180e'
             '9da45cc3951ae03086ec663e6273c2de0183495fd15dc34ddd9aa100346d4d3a'
+            'ebf153d5789f9d24cb98ae607d227286e1da6ce54e149c8be4f47e08ee729573'
             '7bb97271eb2dc5d1dcb95f9763f505970d234df17f1b8d79b467b9020257915a')
 sha256sums_arm=('72f4a9f4b575d341d45ecb39894a78951e8db837220578ad243c8f3c2f04fc73')
 sha256sums_armv7h=('88349fabbfc914a77e58ac95a82a420173c6d1381c6a4fd63d1bb4bf4e42277b')
@@ -49,9 +51,7 @@ package() {
   cp -dr --no-preserve='ownership' usr/lib/plexmediaserver "${pkgdir}"/opt/
   install -m 644 plexmediaserver.service "${pkgdir}"/usr/lib/systemd/system/
   install -m 644 plexmediaserver.conf.d "${pkgdir}"/etc/conf.d/plexmediaserver
-
-  install -dm 755 "${pkgdir}"/var/lib/plex
-  chown 421:421 -R "${pkgdir}"/var/lib/plex
+  install -Dm644 "$srcdir/plex.sysusers" "$pkgdir/usr/lib/sysusers.d/plex.conf"
 
   install -dm 755 "${pkgdir}"/usr/share/licenses/${pkgname}
   install -m 644 terms.txt "${pkgdir}"/usr/share/licenses/${pkgname}/
diff --git a/plex-media-server.install b/plex-media-server.install
index 87a867d..e6a2db3 100644
--- a/plex-media-server.install
+++ b/plex-media-server.install
@@ -1,33 +1,6 @@
 post_install() {
-  if [[ -n $(getent group 421) && $(getent group 421) != $(getent group plex) ]]; then
-    echo "GID 421 is already assigned to the $(getent group 421 | cut -d':' -f1) group, cannot create the plex group."
-  elif [[ -n $(getent passwd 421) && $(getent passwd 421) != $(getent passwd plex) ]]; then
-    echo "UID 421 is already assigned to the $(getent passwd 421 | cut -d':' -f1) user, cannot create the plex user."
-  else
-    if [[ -n $(getent passwd plex) && $(getent passwd plex) != 'plex:x:421:421:Plex User:/var/lib/plex:/usr/bin/nologin' ]]; then
-      echo "The plex user is outdated. It will be removed and recreated."
-      if [[ -z $(pidof "Plex Media Server") ]]; then
-        userdel plex
-        chown 421:421 -R /var/lib/plex
-      else
-        echo "Unable to update the plex user. Please stop plexmediaserver.service and reinstall the package."
-      fi
-    fi
-    if [[ -z $(getent group plex) ]]; then
-      groupadd -g 421 plex
-    fi
-    if [[ -z $(getent passwd plex) ]]; then
-      useradd -c 'Plex User' -u 421 -g plex -d /var/lib/plex -s /usr/bin/nologin plex
-    fi
-    passwd -l plex > /dev/null
-  fi
-}
-
-post_upgrade() {
-  post_install
-  if [[ $(vercmp 0.9.11.1.678-1 $2) == '1' ]]; then
-    echo "Plex' home is now located in '/var/lib/plex'. You will have to move the 'Plex Media Server' directory located in '/opt/plexmediserver/Library/Application Support' into the new home. Please refer to 'https://support.plex.tv/hc/en-us/articles/201370363-Move-an-Install-to-Another-System' for detailed instructions."
-  fi
+  systemd-sysusers plex.conf
+  [[ -d /var/lib/plex ]] || install -dm 750 -o plex -g plex /var/lib/plex
 }
 
 # vim: ts=2 sw=2 et: