diff options
author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-04-18 21:51:20 -0300 |
---|---|---|
committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-04-18 21:51:20 -0300 |
commit | f0a7e44c0037beb1c6cf1c2e25d8de1a9e9393c8 (patch) | |
tree | 6dda6d4856970e43904fc1e89cbeeb7157ea9ade /testing/gdm/gdm.install | |
parent | 78538de96d5d6d9516ae18b68d4c62654eea5278 (diff) | |
parent | 6ca29e0c62691c1f3120dda0f6b59dbb86cc9295 (diff) |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/cppcheck/PKGBUILD
Diffstat (limited to 'testing/gdm/gdm.install')
-rw-r--r-- | testing/gdm/gdm.install | 21 |
1 files changed, 2 insertions, 19 deletions
diff --git a/testing/gdm/gdm.install b/testing/gdm/gdm.install index c2b5e375e..6cd981d77 100644 --- a/testing/gdm/gdm.install +++ b/testing/gdm/gdm.install @@ -2,31 +2,14 @@ pkgname=gdm post_install() { getent group gdm >/dev/null 2>&1 || groupadd -g 120 gdm - if getent passwd gdm > /dev/null 2>&1; then - usr/sbin/usermod -d /var/lib/gdm -c 'Gnome Display Manager' -s /sbin/nologin gdm > /dev/null 2>&1 - else - usr/sbin/useradd -c 'Gnome Display Manager' -u 120 -g gdm -d /var/lib/gdm -s /sbin/nologin gdm - fi + getent passwd gdm > /dev/null 2>&1 || usr/sbin/useradd -c 'Gnome Display Manager' -u 120 -g gdm -d /var/lib/gdm -s /sbin/nologin gdm passwd -l gdm > /dev/null - chown gdm:gdm /var/lib/gdm > /dev/null - chown -R gdm:gdm /var/lib/gdm/.gconf.mandatory + chown -R gdm:gdm /var/lib/gdm > /dev/null gtk-update-icon-cache -q -t -f usr/share/icons/hicolor gconfpkg --install ${pkgname} } -pre_upgrade() { - if [ -f opt/gnome/etc/gdm/custom.conf ]; then - mkdir -p etc/gdm - sed -e 's|/opt/gnome/libexec|usr/lib/gdm|g' \ - -e 's|/opt/gnome/etc|/etc|g' \ - -e 's|/opt/gnome/|/usr/|g' \ - opt/gnome/etc/gdm/custom.conf > etc/gdm/custom.conf - mv opt/gnome/etc/gdm/custom.conf opt/gnome/etc/gdm/custom.conf.pacsave - fi - pre_remove -} - pre_remove() { if [ -f usr/share/gconf/schemas/${pkgname}.schemas ]; then gconfpkg --uninstall ${pkgname} |