Updated installer to not force uid/gid for plex user

Updated installer to match plex-media-server-plexpass logic

4 files changed, 14 insertions, 37 deletions

diff --git a/.SRCINFO b/.SRCINFO
index bb7add1f24a8..1313cf4918a1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Wed Jun 15 15:52:08 UTC 2016
+# Wed Jun 15 17:39:31 UTC 2016
 pkgbase = plex-media-server
 	pkgdesc = Plex Media Server
 	pkgver = 0.9.16.6.1993
-	pkgrel = 2
+	pkgrel = 3
 	url = https://plex.tv/
 	install = plex-media-server.install
 	arch = arm
@@ -18,9 +18,11 @@ pkgbase = plex-media-server
 	backup = etc/conf.d/plexmediaserver
 	source = plexmediaserver.conf.d
 	source = plexmediaserver.service
+	source = plex.sysusers
 	source = terms.txt
 	sha256sums = 7ab1ee8da9012d257b7f473fb79d76b201ca592cbe3722f977a43b58bfad180e
 	sha256sums = 9da45cc3951ae03086ec663e6273c2de0183495fd15dc34ddd9aa100346d4d3a
+	sha256sums = ebf153d5789f9d24cb98ae607d227286e1da6ce54e149c8be4f47e08ee729573
 	sha256sums = 7bb97271eb2dc5d1dcb95f9763f505970d234df17f1b8d79b467b9020257915a
 	source_arm = https://downloads.plex.tv/plex-media-server/0.9.16.6.1993-5089475/PlexMediaServer-0.9.16.6.1993-5089475-arm.spk
 	sha256sums_arm = e960cb98191a39cbf4557c4dea0a75e638ad95415eb666c035132b6c67e45940
diff --git a/PKGBUILD b/PKGBUILD
index 75cfd163441a..b163d2e590cd 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -9,7 +9,7 @@
 pkgname=plex-media-server
 pkgver=0.9.16.6.1993
 _pkgsum=5089475
-pkgrel=2
+pkgrel=3
 pkgdesc='Plex Media Server'
 arch=('arm' 'armv7h' 'i686' 'x86_64')
 url='https://plex.tv/'
@@ -23,6 +23,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")
@@ -30,6 +31,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=('e960cb98191a39cbf4557c4dea0a75e638ad95415eb666c035132b6c67e45940')
 sha256sums_armv7h=('dfe4fea0cf8aadd4d36d967e2013b64b5bbc461d10e46230898097f84d952d61')
@@ -51,12 +53,10 @@ 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 644 "$srcdir/plex.sysusers" "$pkgdir/usr/lib/sysusers.d/plex.conf"
 
-  install -dm 755 "${pkgdir}"/var/lib/plex
-  chown 421:421 -R "${pkgdir}"/var/lib/plex
-
-  install -dm 755 "${pkgdir}"/usr/share/licenses/plex-media-server
-  install -m 644 terms.txt "${pkgdir}"/usr/share/licenses/plex-media-server/
+  install -dm 755 "${pkgdir}"/usr/share/licenses/${pkgname}
+  install -m 644 terms.txt "${pkgdir}"/usr/share/licenses/${pkgname}/
 }
 
 # vim: ts=2 sw=2 et:
diff --git a/plex-media-server.install b/plex-media-server.install
index 87a867d8a67c..e6a2db341f8a 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:
diff --git a/plex.sysusers b/plex.sysusers
new file mode 100644
index 000000000000..e23680f986fd
--- /dev/null
+++ b/plex.sysusers
@@ -0,0 +1,2 @@
+u plex - "Plex Media Server" /opt/plexmediaserver
+