1 files changed, 7 insertions, 49 deletions
diff --git a/community/lxdm/lxdm.install b/community/lxdm/lxdm.install
index 8d42de90f..522f9e3b1 100644
--- a/community/lxdm/lxdm.install
+++ b/community/lxdm/lxdm.install
@@ -1,59 +1,17 @@
 pkgname=lxdm
 
 post_install() {
-  # make sure the group and user "lxdm" exist on this system and have the correct values
-  if grep -q "^lxdm:" /etc/group &> /dev/null ; then
-    groupmod -g 121 -n lxdm lxdm &> /dev/null
-  else
-    groupadd -g 121 lxdm &> /dev/null
-  fi
-
-  if grep -q "^lxdm:" /etc/passwd 2> /dev/null ; then
-    usermod -s /sbin/nologin -c "LXDE Display Manager user" -d /var/lib/lxdm -u 121 -g lxdm lxdm &> /dev/null
-  else
-    useradd -s /sbin/nologin -c "LXDE Display Manager user" -d /var/lib/lxdm -u 121 -g lxdm -m -r lxdm &> /dev/null
-  fi 
-  passwd -l lxdm > /dev/null
-
-#  chown root:lxdm /etc/lxdm/{lxdm.conf,xinitrc} > /dev/null
-  chown root:lxdm /etc/lxdm/lxdm.conf > /dev/null
-  chown -R root:lxdm /var/lib/lxdm > /dev/null
-  chown -R root:lxdm /var/run/lxdm > /dev/null
-
-cat << EOF
->>> To make the LXDM as your default DM,
->>> put, 'lxdm' or '@lxdm' (without quotes) on DAEMONS in /etc/rc.conf
->>>
->>> You can also use /etc/inittab,
->>> just add 'x:5:respawn:/usr/sbin/lxdm >& /dev/null' (without quotes)
->>> in the end of the file /etc/inittab
->>> and uncoment the line on the top 'id:5:initdefault:'.
-EOF
+    getent group lxdm > /dev/null 2>&1 || groupadd -g 121 lxdm
+    getent passwd lxdm > /dev/null 2>&1 || useradd -c 'LXDE Display Manager' -u 121 -g lxdm -d /var/lib/lxdm -s /sbin/nologin lxdm
+    passwd -l lxdm > /dev/null
+    chown -R lxdm:lxdm /var/lib/lxdm > /dev/null
 }
 
 post_upgrade() {
-  # make sure the group and user "lxdm" exist on this system and have the correct values
-  if grep -q "^lxdm:" /etc/group &> /dev/null ; then
-    groupmod -g 121 -n lxdm lxdm &> /dev/null
-  else
-    groupadd -g 121 lxdm &> /dev/null
-  fi
-
-  if grep -q "^lxdm:" /etc/passwd 2> /dev/null ; then
-    usermod -s /sbin/nologin -c "LXDE Display Manager user" -d /var/lib/lxdm -u 121 -g lxdm lxdm &> /dev/null
-  else
-    useradd -s /sbin/nologin -c "LXDE Display Manager user" -d /var/lib/lxdm -u 121 -g lxdm -m -r lxdm &> /dev/null
-  fi 
-  passwd -l lxdm > /dev/null
-
-#  chown root:lxdm /etc/lxdm/{lxdm.conf,xinitrc} > /dev/null
-  chown root:lxdm /etc/lxdm/lxdm.conf > /dev/null
-  chown -R root:lxdm /var/lib/lxdm > /dev/null
-  chown -R root:lxdm /var/run/lxdm > /dev/null
+    post_install
 }
 
 post_remove() {
-  # Removing lxdm group+user
-  getent passwd lxdm >/dev/null 2>&1 && userdel lxdm #|| /bin/true
-  getent group lxdm >/dev/null 2>&1 && groupdel lxdm #|| /bin/true
+    getent passwd lxdm > /dev/null 2>&1 && userdel lxdm
+    getent group lxdm > /dev/null 2>&1 && groupdel lxdm
 }