[arch-commits] Commit in lxdm/trunk (PKGBUILD lxdm.install)

[Balló György]

    Date: Wednesday, August 3, 2016 @ 13:04:53
  Author: bgyorgy
Revision: 184988

upgpkg: lxdm 0.5.3-3

Simplify user management

Modified:
  lxdm/trunk/PKGBUILD
  lxdm/trunk/lxdm.install

--------------+
 PKGBUILD     |   12 +-----------
 lxdm.install |   11 +++++------
 2 files changed, 6 insertions(+), 17 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-08-03 12:24:07 UTC (rev 184987)
+++ PKGBUILD	2016-08-03 13:04:53 UTC (rev 184988)
@@ -7,7 +7,7 @@
 pkgbase=lxdm
 pkgname=(lxdm lxdm-gtk3)
 pkgver=0.5.3
-pkgrel=2
+pkgrel=3
 pkgdesc='Lightweight X11 Display Manager'
 arch=('i686' 'x86_64')
 url="http://lxde.org/"
@@ -70,11 +70,6 @@
   cd gtk2
   make DESTDIR="$pkgdir" install
   chmod 644 "$pkgdir/etc/lxdm/lxdm.conf"
-
-  # Home directory
-  install -dm 755 "$pkgdir/var/lib/lxdm"
-  echo 'GDK_CORE_DEVICE_EVENTS=true' > "$pkgdir"/var/lib/lxdm/.pam_environment
-  chown -R 121:121 "$pkgdir/var/lib/lxdm"
 }
 
 package_lxdm-gtk3() {
@@ -86,9 +81,4 @@
   cd gtk3
   make DESTDIR="$pkgdir" install
   chmod 644 "$pkgdir/etc/lxdm/lxdm.conf"
-
-  # Home directory
-  install -dm 755 "$pkgdir/var/lib/lxdm"
-  echo 'GDK_CORE_DEVICE_EVENTS=true' > "$pkgdir"/var/lib/lxdm/.pam_environment
-  chown -R 121:121 "$pkgdir/var/lib/lxdm"
 }

Modified: lxdm.install
===================================================================
--- lxdm.install	2016-08-03 12:24:07 UTC (rev 184987)
+++ lxdm.install	2016-08-03 13:04:53 UTC (rev 184988)
@@ -1,11 +1,10 @@
 post_install() {
-  getent group lxdm > /dev/null 2>&1 && \
-    groupmod -g 121 lxdm > /dev/null 2>&1 || \
-    groupadd -g 121 lxdm
   getent passwd lxdm > /dev/null 2>&1 && \
-    usermod -c 'Lightweight X11 Display Manager' -u 121 -g 121 -d /var/lib/lxdm -s /sbin/nologin lxdm > /dev/null 2>&1 || \
-    useradd -c 'Lightweight X11 Display Manager' -u 121 -g 121 -d /var/lib/lxdm -s /sbin/nologin lxdm
-  passwd -l lxdm > /dev/null
+    usermod -L -c 'Lightweight X11 Display Manager' -d /var/lib/lxdm -s /sbin/nologin lxdm > /dev/null 2>&1 || \
+    useradd -rM -c 'Lightweight X11 Display Manager' -d /var/lib/lxdm -s /sbin/nologin lxdm
+  mkdir -p /var/lib/lxdm
+  chown lxdm:lxdm /var/lib/lxdm
+  chmod 700 /var/lib/lxdm
 }
 
 post_upgrade() {