1 files changed, 28 insertions, 18 deletions

diff --git a/security/drweb/scripts/post-install b/security/drweb/scripts/post-install
index 796b644ce5f3..eef1258c189b 100644
--- a/security/drweb/scripts/post-install
+++ b/security/drweb/scripts/post-install
@@ -1,31 +1,41 @@
 #!/bin/sh
 ex=0
-if ! id -u drweb > /dev/null 2>&1; then
-  echo "You need an account \"drweb\" to install this package."
-  echo "Please add it by hand (try \"man vipw\") and try again."
-  echo ""
-  echo "An example /etc/master.passwd entry is:"
-  echo "drweb:*:426:426::0:0:Dr.Web Scanner:/nonexistent:/sbin/nologin"
-  echo ""
-  ex=1
+USER=drweb
+GROUP=${USER}
+UID=426
+GID=${UID}
+
+if ! pw group show "${GROUP}" 2>/dev/null 1>&2; then
+	if pw groupadd ${GROUP} -g ${GID}; then
+		echo "Added group \"${GROUP}\"."
+	else
+		echo "Adding group \"${GROUP}\" failed..."
+		ex=1
+	fi
 fi
-if ! grep -q "^drweb:" /etc/group; then
-  echo "You need a group \"drweb\" to install this package."
-  echo ""
-  echo "An example /etc/group entry is:"
-  echo "drweb:*:426:"
-  echo ""
-  ex=1
+
+if ! pw user show "${USER}" 2>/dev/null 1>&2; then
+	if pw useradd ${USER} -u ${UID} -g ${GROUP} -h - \
+		-s "/sbin/nologin" -d "/nonexistent" -c "Dr. Web Scanner"
+	then
+		echo "Added user \"${USER}\"."
+	else
+		echo "Adding user \"${USER}\" failed..."
+		ex=1
+	fi
 fi
+
 if ! grep -q "^!drweb" /etc/syslog.conf; then
   echo "You may also add this lines to your /etc/syslog.conf:"
   echo "*.*             /var/log/drwebd.log"
   echo ""
 fi
 if ! grep -q drweb /etc/crontab; then
-  echo "You may also add this crontab entry to /etc/crontab"
-  echo "0 12 * * * ${BINOWN} ${PREFIX}/drweb/update/update.pl ${PREFIX}/drweb"
-  echo ""
+  if ! crontab -l -u root | grep -q drweb; then
+      echo "You may also add this crontab entry to /etc/crontab"
+      echo "0 12 * * * ${BINOWN} ${PREFIX}/drweb/update/update.pl ${PREFIX}/drweb"
+      echo ""
+  fi
 fi
 [ "$ex" = "1" ] && exit 1
 install -dv -m 0755 -o drweb -g ${BINGRP} ${PREFIX}/drweb/run