!5 fix add user

Merge pull request !5 from panchenbo/master
This commit is contained in:
openeuler-ci-bot 2020-09-10 16:55:38 +08:00 committed by Gitee
commit dab90b64a4

View File

@ -2,7 +2,7 @@
Name: dde Name: dde
Version: 2020.06.11 Version: 2020.06.11
Release: 4 Release: 5
Summary: Deepin New Desktop Environment - Next Summary: Deepin New Desktop Environment - Next
License: GPLv3 License: GPLv3
URL: https://uos-packages.deepin.com/uos/pool/main/d/dde/ URL: https://uos-packages.deepin.com/uos/pool/main/d/dde/
@ -139,23 +139,11 @@ install -Dm644 %{SOURCE1} %{buildroot}/etc/rsyslog.d/dde.conf
install -Dm644 %{SOURCE2} %{buildroot}/etc/logrotate.d/dde install -Dm644 %{SOURCE2} %{buildroot}/etc/logrotate.d/dde
%pre %pre
if ! /usr/bin/id -g ddeuser &>/dev/null; then getent group ddeuser >/dev/null || groupadd -r ddeuser
/usr/sbin/groupadd -r ddeuser getent passwd ddeuser >/dev/null || useradd -g ddeuser -G wheel -m ddeuser -c "User of dde"> /dev/null
fi
if ! /usr/bin/id ddeuser &>/dev/null; then
/usr/sbin/useradd -g ddeuser -G wheel -m ddeuser > /dev/null 2>&1
fi
echo "ddeuser echo "ddeuser
ddeuser" | passwd ddeuser > /dev/null 2>&1 ddeuser" | passwd ddeuser > /dev/null 2>&1
%post
if ! /usr/bin/id -g ddeuser &>/dev/null; then
/usr/sbin/groupdel -f ddeuser
fi
if ! /usr/bin/id ddeuser &>/dev/null; then
/usr/sbin/userdel -fr ddeuser > /dev/null 2>&1
fi
%files %files
%doc debian/copyright %doc debian/copyright
%doc debian/changelog %doc debian/changelog
@ -163,6 +151,9 @@ fi
%{_sysconfdir}/logrotate.d/dde %{_sysconfdir}/logrotate.d/dde
%changelog %changelog
* Thu Sep 10 2020 chenbo pan <panchenbo@uniontech.com> - 2020.06.11-5
- fix add ddeuser
* Thu Sep 10 2020 chenbo pan <panchenbo@uniontech.com> - 2020.06.11-4 * Thu Sep 10 2020 chenbo pan <panchenbo@uniontech.com> - 2020.06.11-4
- add ddeuser - add ddeuser