Improve consistency of scripts using adduser/addgroup.

Following rules have been applied:
- script starts with shebang !#/bin/sh followed by blank line,
- script ends with exit 0 prepended by blank line,
- only stderr of adduser, addgroup or passwd is redirected to /dev/null,
- getent passwd/group instances has been removed,
- manual checking of file and group existence has been removed,
- `|| true` instances has been removed.

Comments and line wrapping have been preserved.

101 files changed, 155 insertions, 73 deletions

diff --git a/main/abuild/abuild.pre-install b/main/abuild/abuild.pre-install
index fb2cf9e31d..fd3d39a368 100644
--- a/main/abuild/abuild.pre-install
+++ b/main/abuild/abuild.pre-install
@@ -1,6 +1,5 @@
 #!/bin/sh
 
-if ! getent group abuild >/dev/null; then
-	addgroup -S abuild
-fi
+addgroup -S abuild 2>/dev/null
+
 exit 0
diff --git a/main/alpine-baselayout/alpine-baselayout.pre-install b/main/alpine-baselayout/alpine-baselayout.pre-install
index 3b9f141083..fc0d0b9f5d 100644
--- a/main/alpine-baselayout/alpine-baselayout.pre-install
+++ b/main/alpine-baselayout/alpine-baselayout.pre-install
@@ -1,6 +1,5 @@
 #!/bin/sh
 
-if [ -e /etc/group ] && ! grep -q '^shadow:' /etc/group; then
-        addgroup -S -g 42 shadow
-fi
+addgroup -S -g 42 shadow 2>/dev/null
 
+exit 0
diff --git a/main/alpine-baselayout/alpine-baselayout.pre-upgrade b/main/alpine-baselayout/alpine-baselayout.pre-upgrade
index 8a7098f7d1..f7c8db83c4 100644
--- a/main/alpine-baselayout/alpine-baselayout.pre-upgrade
+++ b/main/alpine-baselayout/alpine-baselayout.pre-upgrade
@@ -14,6 +14,6 @@ for i in /etc/modprobe.d/*; do
 	mv "$i" "$i".conf
 done
 
-if [ -e /etc/group ] && ! grep -q '^shadow:' /etc/group; then
-	addgroup -S -g 42 shadow
-fi
+addgroup -S -g 42 shadow 2>/dev/null
+
+exit 0
diff --git a/main/amavisd-new/amavisd-new.pre-install b/main/amavisd-new/amavisd-new.pre-install
index d0c07006d0..5223f9fb20 100755
--- a/main/amavisd-new/amavisd-new.pre-install
+++ b/main/amavisd-new/amavisd-new.pre-install
@@ -2,5 +2,5 @@
 
 addgroup -S amavis 2>/dev/null
 adduser -S -D -G amavis -h /var/amavis -s /sbin/nologin -g amavis amavis 2>/dev/null
-exit 0
 
+exit 0
diff --git a/main/apache2/apache2.pre-install b/main/apache2/apache2.pre-install
index cb803238f0..f142d894e6 100644
--- a/main/apache2/apache2.pre-install
+++ b/main/apache2/apache2.pre-install
@@ -1,5 +1,7 @@
 #!/bin/sh
+
 addgroup -S -g 82 www-data 2>/dev/null
 adduser -S -H -h /var/www -s /sbin/nologin -D -g apache apache 2>/dev/null
 addgroup apache www-data 2>/dev/null
+
 exit 0
diff --git a/main/apache2/apache2.pre-upgrade b/main/apache2/apache2.pre-upgrade
index dbc1d68e43..bb3dba99cb 100644
--- a/main/apache2/apache2.pre-upgrade
+++ b/main/apache2/apache2.pre-upgrade
@@ -2,4 +2,5 @@
 
 addgroup -S -g 82 www-data 2>/dev/null
 addgroup apache www-data 2>/dev/null
+
 exit 0
diff --git a/main/aports-build/aports-build.pre-install b/main/aports-build/aports-build.pre-install
index a4928ebe7b..2fdf497dd5 100644
--- a/main/aports-build/aports-build.pre-install
+++ b/main/aports-build/aports-build.pre-install
@@ -1,4 +1,5 @@
 #!/bin/sh
 
 adduser -S -D -g buildozer buildozer -s /bin/sh 2>/dev/null
+
 exit 0
diff --git a/main/arpwatch/arpwatch.pre-install b/main/arpwatch/arpwatch.pre-install
index d75874fc45..56fdfe34e0 100644
--- a/main/arpwatch/arpwatch.pre-install
+++ b/main/arpwatch/arpwatch.pre-install
@@ -1,4 +1,5 @@
 #!/bin/sh
+
 adduser -S -H -s /sbin/nologin -D -g arpwatch arpwatch 2>/dev/null
-exit 0
 
+exit 0
diff --git a/main/asterisk/asterisk.pre-install b/main/asterisk/asterisk.pre-install
index 935466dde0..df228c28b6 100644
--- a/main/asterisk/asterisk.pre-install
+++ b/main/asterisk/asterisk.pre-install
@@ -3,4 +3,5 @@
 adduser -S -h /var/lib/asterisk -s /sbin/nologin -D -g asterisk asterisk 2>/dev/null
 addgroup -S dialout 2>/dev/null
 addgroup asterisk dialout 2>/dev/null
+
 exit 0
diff --git a/main/asterisk/asterisk.pre-upgrade b/main/asterisk/asterisk.pre-upgrade
index 781d5d8878..02414e674b 100644
--- a/main/asterisk/asterisk.pre-upgrade
+++ b/main/asterisk/asterisk.pre-upgrade
@@ -3,4 +3,5 @@
 adduser -S -h /var/lib/asterisk -s /bin/false -D -g asterisk asterisk 2>/dev/null
 addgroup -S dialout 2>/dev/null
 addgroup asterisk dialout 2>/dev/null
+
 exit 0
diff --git a/main/atheme-iris/atheme-iris.pre-install b/main/atheme-iris/atheme-iris.pre-install
index 4198df244d..ef8ea56f51 100644
--- a/main/atheme-iris/atheme-iris.pre-install
+++ b/main/atheme-iris/atheme-iris.pre-install
@@ -1,4 +1,5 @@
 #!/bin/sh
+
 adduser -S -H -h /usr/share/webapps/atheme-iris -g iris -D -s /sbin/nologin iris >/dev/null
-exit 0
 
+exit 0
diff --git a/main/backuppc/backuppc.pre-install b/main/backuppc/backuppc.pre-install
index 32440ee678..2ed220e00c 100644
--- a/main/backuppc/backuppc.pre-install
+++ b/main/backuppc/backuppc.pre-install
@@ -1,4 +1,6 @@
 #!/bin/sh
-addgroup -S backuppc &>/dev/null
-adduser -S -h /var/lib/BackupPC -s /bin/sh -D -H -G backuppc -g "BackupPC user" backuppc &>/dev/null
+
+addgroup -S backuppc 2>/dev/null
+adduser -S -h /var/lib/BackupPC -s /bin/sh -D -H -G backuppc -g "BackupPC user" backuppc 2>/dev/null
+
 exit 0
diff --git a/main/bacula-client/bacula-client.pre-install b/main/bacula-client/bacula-client.pre-install
index 7827de6015..363af9d964 100644
--- a/main/bacula-client/bacula-client.pre-install
+++ b/main/bacula-client/bacula-client.pre-install
@@ -1,4 +1,6 @@
 #!/bin/sh
+
 addgroup -S bacula 2>/dev/null
 adduser -S -h /var/lib/bacula/ -s /sbin/nologin -G bacula -D -g bacula bacula 2>/dev/null
+
 exit 0
diff --git a/main/bacula/bacula.pre-install b/main/bacula/bacula.pre-install
index 7827de6015..363af9d964 100644
--- a/main/bacula/bacula.pre-install
+++ b/main/bacula/bacula.pre-install
@@ -1,4 +1,6 @@
 #!/bin/sh
+
 addgroup -S bacula 2>/dev/null
 adduser -S -h /var/lib/bacula/ -s /sbin/nologin -G bacula -D -g bacula bacula 2>/dev/null
+
 exit 0
diff --git a/main/bind/bind.pre-install b/main/bind/bind.pre-install
index 116d51eec8..49e398b89f 100644
--- a/main/bind/bind.pre-install
+++ b/main/bind/bind.pre-install
@@ -2,5 +2,5 @@
 
 addgroup -S named 2>/dev/null
 adduser -S -h /etc/bind -s /sbin/nologin -G named -D -g named named 2>/dev/null
-exit 0
 
+exit 0
diff --git a/main/charybdis/charybdis.pre-install b/main/charybdis/charybdis.pre-install
index 83ffff3128..2dab19bc87 100644
--- a/main/charybdis/charybdis.pre-install
+++ b/main/charybdis/charybdis.pre-install
@@ -1,3 +1,5 @@
 #!/bin/sh
+
 adduser -S -h /var/run/charybdis -s /sbin/nologin -D -g ircd ircd 2>/dev/null
+
 exit 0
diff --git a/main/chrony/chrony.pre-install b/main/chrony/chrony.pre-install
index 41e01c6ca9..32b8fe3c31 100644
--- a/main/chrony/chrony.pre-install
+++ b/main/chrony/chrony.pre-install
@@ -2,4 +2,5 @@
 
 addgroup -S chrony 2>/dev/null
 adduser -S -G chrony -h /var/log/chrony -s /sbin/nologin -D -g chrony chrony 2>/dev/null
+
 exit 0
diff --git a/main/clamav/clamav-daemon.pre-install b/main/clamav/clamav-daemon.pre-install
index 5ef833a7a6..0442c39fa2 100644
--- a/main/clamav/clamav-daemon.pre-install
+++ b/main/clamav/clamav-daemon.pre-install
@@ -2,4 +2,5 @@
 
 addgroup -S clamav 2>/dev/null
 adduser -S -h /var/lib/clamav -H -s /sbin/nologin -D -G clamav -g clamav clamav 2>/dev/null
+
 exit 0
diff --git a/main/clamav/clamav-db.pre-install b/main/clamav/clamav-db.pre-install
index f46eabe8b0..b442a43cfd 100644
--- a/main/clamav/clamav-db.pre-install
+++ b/main/clamav/clamav-db.pre-install
@@ -1,4 +1,5 @@
 #!/bin/sh
 
 adduser -S -H -s /sbin/nologin -D -g clamav clamav 2>/dev/null
+
 exit 0
diff --git a/main/clamav/freshclam.pre-install b/main/clamav/freshclam.pre-install
index 5ef833a7a6..0442c39fa2 100644
--- a/main/clamav/freshclam.pre-install
+++ b/main/clamav/freshclam.pre-install
@@ -2,4 +2,5 @@
 
 addgroup -S clamav 2>/dev/null
 adduser -S -h /var/lib/clamav -H -s /sbin/nologin -D -G clamav -g clamav clamav 2>/dev/null
+
 exit 0
diff --git a/main/clamsmtp/clamsmtp.pre-install b/main/clamsmtp/clamsmtp.pre-install
index f46eabe8b0..b442a43cfd 100644
--- a/main/clamsmtp/clamsmtp.pre-install
+++ b/main/clamsmtp/clamsmtp.pre-install
@@ -1,4 +1,5 @@
 #!/bin/sh
 
 adduser -S -H -s /sbin/nologin -D -g clamav clamav 2>/dev/null
+
 exit 0
diff --git a/main/clamsmtp/clamsmtp.pre-upgrade b/main/clamsmtp/clamsmtp.pre-upgrade
index c673e278ec..a58c165100 100644
--- a/main/clamsmtp/clamsmtp.pre-upgrade
+++ b/main/clamsmtp/clamsmtp.pre-upgrade
@@ -11,4 +11,5 @@ if [ -f "$old" ] && [ ! -f "$new" ]; then
 fi
 
 adduser -S -H -s /bin/false -D -g clamav clamav 2>/dev/null
+
 exit 0
diff --git a/main/coova-chilli/coova-chilli.pre-install b/main/coova-chilli/coova-chilli.pre-install
index 15de617e50..65624f364c 100644
--- a/main/coova-chilli/coova-chilli.pre-install
+++ b/main/coova-chilli/coova-chilli.pre-install
@@ -1,4 +1,5 @@
 #!/bin/sh
+
 adduser -S -H -s /sbin/nologin -D -g chilli chilli 2>/dev/null
-exit 0
 
+exit 0
diff --git a/main/cups/cups.pre-install b/main/cups/cups.pre-install
index 4b099d8a26..cdb75cac56 100644
--- a/main/cups/cups.pre-install
+++ b/main/cups/cups.pre-install
@@ -4,4 +4,5 @@ addgroup -S lpadmin 2>/dev/null
 addgroup -S lp 2>/dev/null
 adduser -S -G lp -g lp lp 2>/dev/null
 addgroup lp lp 2>/dev/null
+
 exit 0
diff --git a/main/cvechecker/cvechecker.pre-install b/main/cvechecker/cvechecker.pre-install
index b6981179ab..7cc6f41899 100644
--- a/main/cvechecker/cvechecker.pre-install
+++ b/main/cvechecker/cvechecker.pre-install
@@ -1,3 +1,6 @@
 #!/bin/sh
-addgroup -S cvechecker &>/dev/null
-adduser -S -g cvechecker cvechecker -h /var/cvechecker -DG cvechecker &>/dev/null
+
+addgroup -S cvechecker 2>/dev/null
+adduser -S -g cvechecker cvechecker -h /var/cvechecker -DG cvechecker 2>/dev/null
+
+exit 0
diff --git a/main/dansguardian/dansguardian.pre-install b/main/dansguardian/dansguardian.pre-install
index e897f8c83c..201fdfc408 100644
--- a/main/dansguardian/dansguardian.pre-install
+++ b/main/dansguardian/dansguardian.pre-install
@@ -6,5 +6,6 @@ adduser -S -D -H \
 	-s /sbin/nologin \
 	-G dansguar \
 	-g dansguar \
-	dansguar 2>/dev/null || true
+	dansguar 2>/dev/null
 
+exit 0
diff --git a/main/dbus/dbus.pre-install b/main/dbus/dbus.pre-install
index 7fdb08a691..c736ea0b91 100644
--- a/main/dbus/dbus.pre-install
+++ b/main/dbus/dbus.pre-install
@@ -2,4 +2,5 @@
 
 addgroup -S messagebus 2>/dev/null
 adduser -S -H -h /dev/null -s /sbin/nologin -D -g messagebus messagebus -G messagebus 2>/dev/null
+
 exit 0
diff --git a/main/dhcp/dhcp.pre-install b/main/dhcp/dhcp.pre-install
index 5aaa6c4b7b..83ba7f045e 100644
--- a/main/dhcp/dhcp.pre-install
+++ b/main/dhcp/dhcp.pre-install
@@ -1,5 +1,5 @@
 #!/bin/sh
 
 adduser -S -h /var/lib/dhcp -s /sbin/nologin -D -g dhcp dhcp 2>/dev/null
-exit 0
 
+exit 0
diff --git a/main/distcc/distcc.pre-install b/main/distcc/distcc.pre-install
index b408b4a127..15d591dd1d 100644
--- a/main/distcc/distcc.pre-install
+++ b/main/distcc/distcc.pre-install
@@ -2,4 +2,5 @@
 
 addgroup -S distcc 2>/dev/null
 adduser -S -H -h /dev/null -s /sbin/nologin -G distcc -D -g distcc distcc 2>/dev/null
+
 exit 0
diff --git a/main/djbdns/dnscache.pre-install b/main/djbdns/dnscache.pre-install
index 106fc292cb..1b58fffa1c 100644
--- a/main/djbdns/dnscache.pre-install
+++ b/main/djbdns/dnscache.pre-install
@@ -1,5 +1,5 @@
 #!/bin/sh
 
 adduser -S -h /etc/dnscache -g dnscache -s /sbin/nologin -H -D dnscache 2>/dev/null
-exit 0
 
+exit 0
diff --git a/main/djbdns/tinydns.pre-install b/main/djbdns/tinydns.pre-install
index 8676fb4104..094f0d8fc2 100644
--- a/main/djbdns/tinydns.pre-install
+++ b/main/djbdns/tinydns.pre-install
@@ -1,5 +1,5 @@
 #!/bin/sh
 
 adduser -S -h /etc/tinydns -g tinydns -s /sbin/nologin -H -D tinydns 2>/dev/null
-exit 0
 
+exit 0
diff --git a/main/dnsmasq/dnsmasq.pre-install b/main/dnsmasq/dnsmasq.pre-install
index 43f60b8e6b..1263e54e0f 100644
--- a/main/dnsmasq/dnsmasq.pre-install
+++ b/main/dnsmasq/dnsmasq.pre-install
@@ -2,4 +2,5 @@
 
 addgroup -S dnsmasq 2>/dev/null
 adduser -S -H -h /dev/null -s /sbin/nologin -G dnsmasq -D -g dnsmasq dnsmasq 2>/dev/null
+
 exit 0
diff --git a/main/dovecot/dovecot.pre-install b/main/dovecot/dovecot.pre-install
index 481132bf70..d3c346867e 100644
--- a/main/dovecot/dovecot.pre-install
+++ b/main/dovecot/dovecot.pre-install
@@ -2,4 +2,5 @@
 
 adduser -S -u 90 -H -h /dev/null -s /sbin/nologin -D -g dovecot dovecot 2>/dev/null
 adduser -S -u 91 -H -h /dev/null -s /sbin/nologin -D -g dovenull dovenull 2>/dev/null
+
 exit 0
diff --git a/main/ez-ipupdate/ez-ipupdate.pre-install b/main/ez-ipupdate/ez-ipupdate.pre-install
index 23d9faef73..b6b7e22213 100644
--- a/main/ez-ipupdate/ez-ipupdate.pre-install
+++ b/main/ez-ipupdate/ez-ipupdate.pre-install
@@ -1,5 +1,5 @@
 #!/bin/sh
 
 adduser -S -h /var/lib/ez-ipupdate -s /sbin/nologin -D -g ipupdate ipupdate 2>/dev/null
-exit 0
 
+exit 0
diff --git a/main/fetchmail/fetchmail.pre-install b/main/fetchmail/fetchmail.pre-install
index 67681f8eda..d9c1aed834 100644
--- a/main/fetchmail/fetchmail.pre-install
+++ b/main/fetchmail/fetchmail.pre-install
@@ -1,4 +1,5 @@
 #!/bin/sh
 
 adduser -S -H -h /var/lib/fetchmail -s /sbin/nologin -D -g fetchmail fetchmail 2>/dev/null
+
 exit 0
diff --git a/main/freeradius/freeradius.pre-install b/main/freeradius/freeradius.pre-install
index f02c2c07bb..8b09032720 100644
--- a/main/freeradius/freeradius.pre-install
+++ b/main/freeradius/freeradius.pre-install
@@ -2,5 +2,5 @@
 
 addgroup -S radius 2>/dev/null
 adduser -S -G radius -h /var/log/radius -s /sbin/nologin -D -g radius radius 2>/dev/null
-exit 0
 
+exit 0
diff --git a/main/gdnsd/gdnsd.pre-install b/main/gdnsd/gdnsd.pre-install
index 040e7f11df..8e8af592f4 100644
--- a/main/gdnsd/gdnsd.pre-install
+++ b/main/gdnsd/gdnsd.pre-install
@@ -2,4 +2,5 @@
 
 addgroup -S gdnsd 2>/dev/null
 adduser -S -H -h /dev/null -s /sbin/nologin -D -G gdnsd -g gdnsd gdnsd 2>/dev/null
+
 exit 0
diff --git a/main/gitolite/gitolite.pre-install b/main/gitolite/gitolite.pre-install
index 2d155abb28..80a3a714c3 100644
--- a/main/gitolite/gitolite.pre-install
+++ b/main/gitolite/gitolite.pre-install
@@ -1,3 +1,5 @@
 #!/bin/sh
+
 adduser -S -H -h /var/lib/git -s /bin/sh -D -g git git 2>/dev/null
+
 exit 0
diff --git a/main/gnats/gnats.pre-install b/main/gnats/gnats.pre-install
index 81093a42a1..a66e2d903d 100644
--- a/main/gnats/gnats.pre-install
+++ b/main/gnats/gnats.pre-install
@@ -1,4 +1,5 @@
 #!/bin/sh
 
 adduser -S -h /var/lib/gnatsdb -D -g gnats gnats 2>/dev/null
+
 exit 0
diff --git a/main/gross/gross.pre-install b/main/gross/gross.pre-install
index d3a5f857be..22fecf465e 100644
--- a/main/gross/gross.pre-install
+++ b/main/gross/gross.pre-install
@@ -1,3 +1,5 @@
 #!/bin/sh
+
 adduser -S -H -s /sbin/nologin -D -g gross gross 2>/dev/null
+
 exit 0
diff --git a/main/haproxy/haproxy.pre-install b/main/haproxy/haproxy.pre-install
index 72b8ab0087..162855ab33 100644
--- a/main/haproxy/haproxy.pre-install
+++ b/main/haproxy/haproxy.pre-install
@@ -10,3 +10,4 @@ if [ -e /etc/haproxy.cfg ] && ! [ -e /etc/haproxy/haproxy.cfg ]; then
 	mv /etc/haproxy.cfg /etc/haproxy/haproxy.cfg
 fi
 
+exit 0
diff --git a/main/haproxy/haproxy.pre-upgrade b/main/haproxy/haproxy.pre-upgrade
index 72b8ab0087..162855ab33 100644
--- a/main/haproxy/haproxy.pre-upgrade
+++ b/main/haproxy/haproxy.pre-upgrade
@@ -10,3 +10,4 @@ if [ -e /etc/haproxy.cfg ] && ! [ -e /etc/haproxy/haproxy.cfg ]; then
 	mv /etc/haproxy.cfg /etc/haproxy/haproxy.cfg
 fi
 
+exit 0
diff --git a/main/icecast/icecast.pre-install b/main/icecast/icecast.pre-install
index 8734c1e13d..562611b666 100644
--- a/main/icecast/icecast.pre-install
+++ b/main/icecast/icecast.pre-install
@@ -1,5 +1,5 @@
 #!/bin/sh
 
-adduser -S -h /var/log/icecast -s /sbin/nologin -D -g icecast icecast  2>/dev/null
+adduser -S -h /var/log/icecast -s /sbin/nologin -D -g icecast icecast 2>/dev/null
 
 exit 0
diff --git a/main/ircservices/ircservices.pre-install b/main/ircservices/ircservices.pre-install
index 4f6144a950..2f08491d54 100644
--- a/main/ircservices/ircservices.pre-install
+++ b/main/ircservices/ircservices.pre-install
@@ -1,5 +1,5 @@
 #!/bin/sh
 
 adduser -S -h /var/lib/ircservices -s /sbin/nologin -D -g ircservices ircservices 2>/dev/null
-exit 0
 
+exit 0
diff --git a/main/kamailio/kamailio.pre-install b/main/kamailio/kamailio.pre-install
index 19d11f5c2f..e38239dd6f 100644
--- a/main/kamailio/kamailio.pre-install
+++ b/main/kamailio/kamailio.pre-install
@@ -1,6 +1,6 @@
 #!/bin/sh
 
 addgroup -S kamailio 2>/dev/null
-adduser -S -H -h /var/empty -s /sbin/nologin -D -G kamailio -g kamailio kamailio  2>/dev/null
+adduser -S -H -h /var/empty -s /sbin/nologin -D -G kamailio -g kamailio kamailio 2>/dev/null
 
 exit 0
diff --git a/main/libgphoto2/libgphoto2.pre-install b/main/libgphoto2/libgphoto2.pre-install
index a7d31448b8..c696fcdcaf 100644
--- a/main/libgphoto2/libgphoto2.pre-install
+++ b/main/libgphoto2/libgphoto2.pre-install
@@ -1,6 +1,5 @@
 #!/bin/sh
 
-if ! getent group camera >/dev/null; then
-	addgroup -S camera
-fi
+addgroup -S camera 2>/dev/null
 
+exit 0
diff --git a/main/libvirt/libvirt.post-install b/main/libvirt/libvirt.post-install
index 0be14b9e58..a7477012d3 100755
--- a/main/libvirt/libvirt.post-install
+++ b/main/libvirt/libvirt.post-install
@@ -1,3 +1,5 @@
 #!/bin/sh
-addgroup -S libvirt &>/dev/null
+
+addgroup -S libvirt 2>/dev/null
+
 exit 0
diff --git a/main/logcheck/logcheck.pre-install b/main/logcheck/logcheck.pre-install
index ea6028c49a..818fda5f02 100644
--- a/main/logcheck/logcheck.pre-install
+++ b/main/logcheck/logcheck.pre-install
@@ -2,4 +2,5 @@
 
 addgroup -S logcheck 2>/dev/null
 adduser -S -H -h /dev/null -s /sbin/nologin -D -G logcheck -g logcheck logcheck 2>/dev/null
+
 exit 0
diff --git a/main/mariadb/mariadb.pre-install b/main/mariadb/mariadb.pre-install
index e4f16d2ddc..14677b1fb6 100644
--- a/main/mariadb/mariadb.pre-install
+++ b/main/mariadb/mariadb.pre-install
@@ -2,5 +2,5 @@
 
 addgroup -S mysql 2>/dev/null
 adduser -S -h /var/lib/mysql -s /sbin/nologin -G mysql -D -g mysql mysql 2>/dev/null
-exit 0
 
+exit 0
diff --git a/main/memcached/memcached.pre-install b/main/memcached/memcached.pre-install
index df22cd5fdd..4440f4ee1a 100644
--- a/main/memcached/memcached.pre-install
+++ b/main/memcached/memcached.pre-install
@@ -1,5 +1,5 @@
 #!/bin/sh
 
 adduser -S -H -s /sbin/nologin -D -g memcached memcached 2>/dev/null
-exit 0
 
+exit 0
diff --git a/main/minidlna/minidlna.pre-install b/main/minidlna/minidlna.pre-install
index 4423a73e63..4fc20e601d 100644
--- a/main/minidlna/minidlna.pre-install
+++ b/main/minidlna/minidlna.pre-install
@@ -3,4 +3,5 @@
 addgroup -S minidlna 2>/dev/null
 adduser -S -H -h /var/run/minidlna -s /sbin/nologin -D -G minidlna \
 	-g minidlna minidlna 2>/dev/null
+
 exit 0
diff --git a/main/mlmmj/mlmmj.pre-install b/main/mlmmj/mlmmj.pre-install
index 046a821dc5..7a7b32c0fa 100644
--- a/main/mlmmj/mlmmj.pre-install
+++ b/main/mlmmj/mlmmj.pre-install
@@ -2,4 +2,5 @@
 
 addgroup -S mlmmj 2>/dev/null
 adduser -S -H -h /var/spool/mlmmj -s /sbin/nologin -D -G mlmmj -g mlmmj mlmmj 2>/dev/null
+
 exit 0
diff --git a/main/mosquitto/mosquitto.pre-install b/main/mosquitto/mosquitto.pre-install
index a0a8f7269b..518d9f2443 100644
--- a/main/mosquitto/mosquitto.pre-install
+++ b/main/mosquitto/mosquitto.pre-install
@@ -2,4 +2,5 @@
 
 addgroup -S mosquitto 2>/dev/null
 adduser -S -H -h /var/empty -s /sbin/nologin -D -G mosquitto -g mosquitto mosquitto 2>/dev/null
+
 exit 0
diff --git a/main/mpd/mpd.pre-install b/main/mpd/mpd.pre-install
index 7e012f8983..934307b65a 100644
--- a/main/mpd/mpd.pre-install
+++ b/main/mpd/mpd.pre-install
@@ -1,3 +1,5 @@
 #!/bin/sh
 
-adduser -S -h /var/lib/mpd -s /sbin/nologin -G audio -D -g mpd mpd 2>/dev/null || true
+adduser -S -h /var/lib/mpd -s /sbin/nologin -G audio -D -g mpd mpd 2>/dev/null
+
+exit 0
diff --git a/main/mumble/murmur.pre-install b/main/mumble/murmur.pre-install
index cb0e0ebbaa..980ed34a63 100755
--- a/main/mumble/murmur.pre-install
+++ b/main/mumble/murmur.pre-install
@@ -1,4 +1,6 @@
 #!/bin/sh
-addgroup -S murmur
-adduser -S -h /var/lib/murmur -s /sbin/nologin -G murmur -g "Mumble daemon" -H -D murmur
+
+addgroup -S murmur 2>/dev/null
+adduser -S -h /var/lib/murmur -s /sbin/nologin -G murmur -g "Mumble daemon" -H -D murmur 2>/dev/null
+
 exit 0
diff --git a/main/nagios/nagios.pre-install b/main/nagios/nagios.pre-install
index d9c0f3c9f4..2e2dbbfa33 100644
--- a/main/nagios/nagios.pre-install
+++ b/main/nagios/nagios.pre-install
@@ -2,4 +2,5 @@
 
 addgroup -S nagios 2>/dev/null
 adduser -S -G nagios -H -h /var/nagios -s /sbin/nologin -g nagios nagios 2>/dev/null
+
 exit 0
diff --git a/main/ngircd/ngircd.pre-install b/main/ngircd/ngircd.pre-install
index 036c9aba8d..bb5f05a03b 100644
--- a/main/ngircd/ngircd.pre-install
+++ b/main/ngircd/ngircd.pre-install
@@ -1,4 +1,5 @@
 #!/bin/sh
 
 adduser -S -H -h /etc/ngircd -s /sbin/nologin -D -g ngircd ngircd 2>/dev/null
+
 exit 0
diff --git a/main/nrpe/nrpe.pre-install b/main/nrpe/nrpe.pre-install
index 7ee629b587..e00f960454 100644
--- a/main/nrpe/nrpe.pre-install
+++ b/main/nrpe/nrpe.pre-install
@@ -2,4 +2,5 @@
 
 adduser -S -H -h /dev/null -s /sbin/nologin -D -g nagios nagios 2>/dev/null
 addgroup -S nagios 2>/dev/null
+
 exit 0
diff --git a/main/nsd/nsd.pre-install b/main/nsd/nsd.pre-install
index 106ac00ccd..a94f6e083f 100644
--- a/main/nsd/nsd.pre-install
+++ b/main/nsd/nsd.pre-install
@@ -1,4 +1,6 @@
 #!/bin/sh
+
 addgroup -S nsd 2>/dev/null
 adduser -S -G nsd -H -h /var/db/nsd -s /sbin/nologin -g nsd nsd 2>/dev/null
+
 exit 0
diff --git a/main/nss-pam-ldapd/nss-pam-ldapd.pre-install b/main/nss-pam-ldapd/nss-pam-ldapd.pre-install
index 5a7076fa8a..58b4216dc3 100644
--- a/main/nss-pam-ldapd/nss-pam-ldapd.pre-install
+++ b/main/nss-pam-ldapd/nss-pam-ldapd.pre-install
@@ -6,4 +6,5 @@ groupname=$username
 addgroup -S $username 2>/dev/null
 adduser -S -H -h /var/run/$username -s /sbin/nologin -D -G $groupname \
 	-g $username $username 2>/dev/null
+
 exit 0
diff --git a/main/ntop/ntop.pre-install b/main/ntop/ntop.pre-install
index 2386dc8069..9af92bb5d7 100755
--- a/main/ntop/ntop.pre-install
+++ b/main/ntop/ntop.pre-install
@@ -1,4 +1,6 @@
 #!/bin/sh
+
 addgroup -S ntop 2>/dev/null
 adduser -S -h /var/lib/ntop -s /sbin/nologin -G ntop -H -D -g ntop ntop 2>/dev/null
+
 exit 0
diff --git a/main/open-vm-tools/open-vm-tools.pre-install b/main/open-vm-tools/open-vm-tools.pre-install
index 15fbca33b8..39b4850390 100644
--- a/main/open-vm-tools/open-vm-tools.pre-install
+++ b/main/open-vm-tools/open-vm-tools.pre-install
@@ -1,4 +1,5 @@
 #!/bin/sh
+
 addgroup -S vmware 2>/dev/null
-exit 0
 
+exit 0
diff --git a/main/openntpd/openntpd.pre-install b/main/openntpd/openntpd.pre-install
index 997e7bf826..c3d9986a65 100644
--- a/main/openntpd/openntpd.pre-install
+++ b/main/openntpd/openntpd.pre-install
@@ -2,6 +2,6 @@
 
 # this user should be included in alpine-baselayout-1.2.
 # included here for backward compability.
-adduser -S -H -h /var/empty -s /sbin/nologin -D -g ntp ntp  2>/dev/null
+adduser -S -H -h /var/empty -s /sbin/nologin -D -g ntp ntp 2>/dev/null
 
 exit 0
diff --git a/main/opensmtpd/opensmtpd.pre-install b/main/opensmtpd/opensmtpd.pre-install
index af0620e3db..8cbebc19a0 100644
--- a/main/opensmtpd/opensmtpd.pre-install
+++ b/main/opensmtpd/opensmtpd.pre-install
@@ -2,10 +2,8 @@
 
 addgroup -S smtpd 2>/dev/null
 addgroup -S smtpq 2>/dev/null
-
 adduser -S -H -D -s /sbin/nologin -h /dev/null -g 'SMTP Daemon' -G smtpd smtpd 2>/dev/null
 adduser -S -H -D -s /sbin/nologin -h /dev/null -g 'SMTPD Queue' -G smtpq smtpq 2>/dev/null
-
 mkdir -p /var/spool/mail
 
 exit 0
diff --git a/main/opentracker/opentracker.pre-install b/main/opentracker/opentracker.pre-install
index 2e591dbb9d..4a573b2733 100644
--- a/main/opentracker/opentracker.pre-install
+++ b/main/opentracker/opentracker.pre-install
@@ -1,5 +1,5 @@
 #!/bin/sh
 
 adduser -S -D -H -h /var/empty -s /sbin/false -g opentracker opentracker 2>/dev/null
-exit 0
 
+exit 0
diff --git a/main/openvpn/openvpn.pre-install b/main/openvpn/openvpn.pre-install
index 37e0bf2532..ff553b811f 100644
--- a/main/openvpn/openvpn.pre-install
+++ b/main/openvpn/openvpn.pre-install
@@ -2,4 +2,5 @@
 
 addgroup -S openvpn 2>/dev/null
 adduser -S -H -h /dev/null -s /sbin/nologin -D -G openvpn -g openvpn openvpn 2>/dev/null
+
 exit 0
diff --git a/main/pcsc-lite/pcsc-lite.pre-install b/main/pcsc-lite/pcsc-lite.pre-install
index 192e10e612..2b9092985a 100644
--- a/main/pcsc-lite/pcsc-lite.pre-install
+++ b/main/pcsc-lite/pcsc-lite.pre-install
@@ -6,4 +6,5 @@ groupname=$username
 addgroup -S $username 2>/dev/null
 adduser -S -H -h /var/run/$username -s /sbin/nologin -D -G $groupname \
 	-g $username $username 2>/dev/null
+
 exit 0
diff --git a/main/pdnsd/pdnsd.pre-install b/main/pdnsd/pdnsd.pre-install
index b916dab593..164ef02a44 100644
--- a/main/pdnsd/pdnsd.pre-install
+++ b/main/pdnsd/pdnsd.pre-install
@@ -1,4 +1,5 @@
 #!/bin/sh
 
 adduser -S -H -h /var/cache/pdnsd -s /sbin/nologin -g pdnsd pdnsd 2>/dev/null
+
 exit 0
diff --git a/main/postfix/postfix.pre-install b/main/postfix/postfix.pre-install
index 6a59570305..d00c3eb1cd 100644
--- a/main/postfix/postfix.pre-install
+++ b/main/postfix/postfix.pre-install
@@ -6,5 +6,4 @@ adduser -S -h /var/spool/postfix -G postfix -g postfix postfix 2>/dev/null
 addgroup postfix mail 2>/dev/null
 adduser -S -H -s /sbin/nologin -h /var/mail/domains -G postdrop -g vmail vmail 2>/dev/null
 
-
 exit 0
diff --git a/main/postgrey/postgrey.pre-install b/main/postgrey/postgrey.pre-install
index e745acfa1a..f70564c42f 100644
--- a/main/postgrey/postgrey.pre-install
+++ b/main/postgrey/postgrey.pre-install
@@ -1,6 +1,6 @@
 #!/bin/sh
 
 addgroup -S postgrey 2>/dev/null
-adduser -S -H -h /dev/null -s /sbin/nologin -D -g postgrey postgrey  2>/dev/null
+adduser -S -H -h /dev/null -s /sbin/nologin -D -g postgrey postgrey 2>/dev/null
 
 exit 0
diff --git a/main/privoxy/privoxy.pre-install b/main/privoxy/privoxy.pre-install
index 72b4ac1774..3f6c75971f 100644
--- a/main/privoxy/privoxy.pre-install
+++ b/main/privoxy/privoxy.pre-install
@@ -2,5 +2,5 @@
 
 addgroup -S privoxy 2>/dev/null
 adduser -S -G privoxy -h /var/log/privoxy -s /sbin/nologin -D -g privoxy privoxy 2>/dev/null
-exit 0
 
+exit 0
diff --git a/main/qemu/qemu.pre-install b/main/qemu/qemu.pre-install
index d6449414cf..9aae4a407d 100644
--- a/main/qemu/qemu.pre-install
+++ b/main/qemu/qemu.pre-install
@@ -1,3 +1,5 @@
 #!/bin/sh
 
-getent group kvm >/dev/null || addgroup -S -g 34 kvm
+addgroup -S -g 34 kvm 2>/dev/null
+
+exit 0
diff --git a/main/quagga-nhrp/quagga-nhrp.pre-install b/main/quagga-nhrp/quagga-nhrp.pre-install
index f8340fa26f..f3b44716c3 100644
--- a/main/quagga-nhrp/quagga-nhrp.pre-install
+++ b/main/quagga-nhrp/quagga-nhrp.pre-install
@@ -2,5 +2,5 @@
 
 addgroup -S quagga 2>/dev/null
 adduser -S -h /var/run/quagga -s /sbin/nologin -D -G quagga -g quagga quagga 2>/dev/null
-exit 0
 
+exit 0
diff --git a/main/quagga/quagga.pre-install b/main/quagga/quagga.pre-install
index f8340fa26f..f3b44716c3 100644
--- a/main/quagga/quagga.pre-install
+++ b/main/quagga/quagga.pre-install
@@ -2,5 +2,5 @@
 
 addgroup -S quagga 2>/dev/null
 adduser -S -h /var/run/quagga -s /sbin/nologin -D -G quagga -g quagga quagga 2>/dev/null
-exit 0
 
+exit 0
diff --git a/main/radvd/radvd.pre-install b/main/radvd/radvd.pre-install
index cc06c7d3e0..44c76a2e5e 100644
--- a/main/radvd/radvd.pre-install
+++ b/main/radvd/radvd.pre-install
@@ -1,5 +1,7 @@
 #!/bin/sh
+
 addgroup -S radvd 2>/dev/null
 adduser -S -s /sbin/nologin -D -H -G radvd \
 	-g "Router advertisement (radvd) user" radvd 2>/dev/null
+
 exit 0
diff --git a/main/redis/redis.pre-install b/main/redis/redis.pre-install
index 2a5993426f..b6cbd05a13 100644
--- a/main/redis/redis.pre-install
+++ b/main/redis/redis.pre-install
@@ -2,4 +2,5 @@
 
 addgroup -S redis 2>/dev/null
 adduser -S -H -h /var/lib/redis -s /bin/false -D -G redis -g redis redis 2>/dev/null
+
 exit 0
diff --git a/main/rpcbind/rpcbind.pre-install b/main/rpcbind/rpcbind.pre-install
index 51fae45404..fe6a8268df 100644
--- a/main/rpcbind/rpcbind.pre-install
+++ b/main/rpcbind/rpcbind.pre-install
@@ -2,4 +2,5 @@
 
 addgroup -S rpc 2>/dev/null
 adduser -S -h /var/lib/rpcbind -s /sbin/nologin -D -G rpc -g rpc rpc 2>/dev/null
+
 exit 0
diff --git a/main/rt4/rt4.pre-install b/main/rt4/rt4.pre-install
index b62454d6d0..88327830ab 100644
--- a/main/rt4/rt4.pre-install
+++ b/main/rt4/rt4.pre-install
@@ -2,4 +2,5 @@
 
 addgroup -S rt4 2>/dev/null
 adduser -S -s /sbin/nologin -G rt4 -D -H -g "Request Tracker 4 user" rt4 2>/dev/null
+
 exit 0
diff --git a/main/rtnppd/rtnppd.pre-install b/main/rtnppd/rtnppd.pre-install
index faf0431225..ec21795914 100644
--- a/main/rtnppd/rtnppd.pre-install
+++ b/main/rtnppd/rtnppd.pre-install
@@ -2,4 +2,5 @@
 
 addgroup -S rtnppd 2>/dev/null
 adduser -S -G rtnppd -H -h /var/run/rtnppd -s /sbin/nologin -g rtnppd rtnppd 2>/dev/null
+
 exit 0
diff --git a/main/rtpproxy/rtpproxy.pre-install b/main/rtpproxy/rtpproxy.pre-install
index cbf1e527c9..93a10a866f 100644
--- a/main/rtpproxy/rtpproxy.pre-install
+++ b/main/rtpproxy/rtpproxy.pre-install
@@ -2,4 +2,5 @@
 
 addgroup -S rtpproxy 2>/dev/null
 adduser -S -G rtpproxy -H -h /usr/share/rtpproxy -s /sbin/nologin -g rtpproxy rtpproxy 2>/dev/null
+
 exit 0
diff --git a/main/sems/sems.pre-install b/main/sems/sems.pre-install
index b3b5c78024..83d4f74068 100644
--- a/main/sems/sems.pre-install
+++ b/main/sems/sems.pre-install
@@ -1,10 +1,6 @@
 #!/bin/sh
 
-if ! getent group sems >/dev/null; then
-	addgroup -S sems
-fi
-if ! getent passwd sems >/dev/null; then
-	adduser -S -H -h /var/empty -s /sbin/nologin -D -G sems -g sems sems 2>/dev/null
-fi
+addgroup -S sems 2>/dev/null
+adduser -S -H -h /var/empty -s /sbin/nologin -D -G sems -g sems sems 2>/dev/null
 
 exit 0
diff --git a/main/sircbot/sircbot.pre-install b/main/sircbot/sircbot.pre-install
index 8bfedcc9c3..c9db4723fe 100644
--- a/main/sircbot/sircbot.pre-install
+++ b/main/sircbot/sircbot.pre-install
@@ -2,4 +2,5 @@
 
 addgroup -S sircbot 2>/dev/null
 adduser -S -h /var/run/sircbot -G sircbot -D -g sircbot sircbot 2>/dev/null
+
 exit 0
diff --git a/main/smokeping/smokeping.pre-install b/main/smokeping/smokeping.pre-install
index 3158cc40ad..f13ff10901 100644
--- a/main/smokeping/smokeping.pre-install
+++ b/main/smokeping/smokeping.pre-install
@@ -2,4 +2,5 @@
 
 addgroup -S smokeping 2>/dev/null
 adduser -S -h /var/lib/smokeping -D -G smokeping -g smokeping smokeping 2>/dev/null
+
 exit 0
diff --git a/main/snmptt/snmptt.pre-install b/main/snmptt/snmptt.pre-install
index efc8a6e05f..e0c65c8020 100644
--- a/main/snmptt/snmptt.pre-install
+++ b/main/snmptt/snmptt.pre-install
@@ -1,3 +1,5 @@
 #!/bin/sh
-adduser -S -h /var/spool/snmptt -s /sbin/nologin -D -g snmptt snmptt &>/dev/null
+
+adduser -S -h /var/spool/snmptt -s /sbin/nologin -D -g snmptt snmptt 2>/dev/null
+
 exit 0
diff --git a/main/snort/snort.pre-install b/main/snort/snort.pre-install
index 47608ed97b..bd0791bab2 100644
--- a/main/snort/snort.pre-install
+++ b/main/snort/snort.pre-install
@@ -1,4 +1,5 @@
 #!/bin/sh
 
 adduser -S -h /var/log/snort -s /sbin/nologin -D -g snort snort 2>/dev/null
+
 exit 0
diff --git a/main/squark/squark.post-install b/main/squark/squark.post-install
index 3c40694692..f4f87982fb 100755
--- a/main/squark/squark.post-install
+++ b/main/squark/squark.post-install
@@ -1,2 +1,5 @@
 #!/bin/sh
-addgroup -S squark &>/dev/null || exit 0
+
+addgroup -S squark 2>/dev/null
+
+exit 0
diff --git a/main/squid/squid.pre-install b/main/squid/squid.pre-install
index 3ac1f9fa16..11ff2bc3d9 100644
--- a/main/squid/squid.pre-install
+++ b/main/squid/squid.pre-install
@@ -1,6 +1,7 @@
 #!/bin/sh
 
-adduser -S -D -g squid squid -H /var/cache/squid  2>/dev/null
+adduser -S -D -g squid squid -H /var/cache/squid 2>/dev/null
 addgroup -S winbind 2>/dev/null
-addgroup squid winbind
+addgroup squid winbind 2>/dev/null
+
 exit 0
diff --git a/main/squid/squid.pre-upgrade b/main/squid/squid.pre-upgrade
index 3ac1f9fa16..11ff2bc3d9 100644
--- a/main/squid/squid.pre-upgrade
+++ b/main/squid/squid.pre-upgrade
@@ -1,6 +1,7 @@
 #!/bin/sh
 
-adduser -S -D -g squid squid -H /var/cache/squid  2>/dev/null
+adduser -S -D -g squid squid -H /var/cache/squid 2>/dev/null
 addgroup -S winbind 2>/dev/null
-addgroup squid winbind
+addgroup squid winbind 2>/dev/null
+
 exit 0
diff --git a/main/strongswan/strongswan.pre-install b/main/strongswan/strongswan.pre-install
index 12371d1196..83b93284a1 100644
--- a/main/strongswan/strongswan.pre-install
+++ b/main/strongswan/strongswan.pre-install
@@ -1,10 +1,6 @@
 #!/bin/sh
 
-if ! getent group ipsec >/dev/null; then
-	addgroup -S ipsec
-fi
-if ! getent passwd ipsec >/dev/null; then
-	adduser -S -H -h /var/empty -s /sbin/nologin -D -G ipsec -g ipsec ipsec 2>/dev/null
-fi
+addgroup -S ipsec 2>/dev/null
+adduser -S -H -h /var/empty -s /sbin/nologin -D -G ipsec -g ipsec ipsec 2>/dev/null
 
 exit 0
diff --git a/main/subversion/subversion.pre-install b/main/subversion/subversion.pre-install
index 31090069b3..955baeefbd 100644
--- a/main/subversion/subversion.pre-install
+++ b/main/subversion/subversion.pre-install
@@ -2,5 +2,5 @@
 
 addgroup -S svnusers 2>/dev/null
 adduser -S -g svn svn -D -h /var/svn -G svnusers 2>/dev/null
-exit 0
 
+exit 0
diff --git a/main/trac/trac.pre-install b/main/trac/trac.pre-install
index 0fa8f02aa0..05e9f2a448 100644
--- a/main/trac/trac.pre-install
+++ b/main/trac/trac.pre-install
@@ -2,4 +2,5 @@
 
 addgroup -S tracd 2>/dev/null
 adduser -S -s /sbin/nologin -G tracd -D -H -g tracd tracd 2>/dev/null
+
 exit 0
diff --git a/main/umurmur/umurmur.post-install b/main/umurmur/umurmur.post-install
index d9a350a78a..771aed1c8e 100755
--- a/main/umurmur/umurmur.post-install
+++ b/main/umurmur/umurmur.post-install
@@ -1,4 +1,6 @@
 #!/bin/sh
-addgroup -S umurmur &>/dev/null
-adduser -S -s /bin/false -G umurmur -h /var/run/umurmurd -D -g umurmur umurmur &>/dev/null
+
+addgroup -S umurmur 2>/dev/null
+adduser -S -s /bin/false -G umurmur -h /var/run/umurmurd -D -g umurmur umurmur 2>/dev/null
+
 exit 0
diff --git a/main/unbound/unbound.pre-install b/main/unbound/unbound.pre-install
index 4cd64d59c6..63c00e9cdc 100644
--- a/main/unbound/unbound.pre-install
+++ b/main/unbound/unbound.pre-install
@@ -3,4 +3,5 @@
 addgroup -S unbound 2>/dev/null
 adduser -S -s /sbin/nologin -D -H -h /etc/unbound -G unbound \
 	-g "Unbound user" unbound 2>/dev/null
+
 exit 0
diff --git a/main/uvncrepeater/uvncrepeater.pre-install b/main/uvncrepeater/uvncrepeater.pre-install
index 0c856f813d..052cd7ff22 100644
--- a/main/uvncrepeater/uvncrepeater.pre-install
+++ b/main/uvncrepeater/uvncrepeater.pre-install
@@ -1,5 +1,5 @@
 #!/bin/sh
 
 adduser -S -D -g uvncrep uvncrep 2>/dev/null
-exit 0
 
+exit 0
diff --git a/main/varnish/varnish.pre-install b/main/varnish/varnish.pre-install
index 74ccfd1421..4e34a099c7 100644
--- a/main/varnish/varnish.pre-install
+++ b/main/varnish/varnish.pre-install
@@ -2,4 +2,5 @@
 
 addgroup -S varnish 2>/dev/null
 adduser -S -H -h /var/lib/varnish -s /sbin/nologin -D -G varnish -g varnish varnish 2>/dev/null
+
 exit 0
diff --git a/main/vlc/vlc-daemon.pre-install b/main/vlc/vlc-daemon.pre-install
index 33f99df870..778c27a8c3 100644
--- a/main/vlc/vlc-daemon.pre-install
+++ b/main/vlc/vlc-daemon.pre-install
@@ -1,6 +1,7 @@
 #!/bin/sh
 
 groups="vlc audio video"
+
 for group in $groups; do
 	addgroup -S $group 2>/dev/null
 done
@@ -10,4 +11,5 @@ adduser -S -h /home/vlc -s /bin/sh -G vlc -D -g vlc vlc 2>/dev/null
 for group in $groups; do
 	addgroup vlc $group 2>/dev/null
 done
+
 exit 0
diff --git a/main/vsftpd/vsftpd.pre-install b/main/vsftpd/vsftpd.pre-install
index 0ed59d906a..c6e45f1b71 100755
--- a/main/vsftpd/vsftpd.pre-install
+++ b/main/vsftpd/vsftpd.pre-install
@@ -1,5 +1,7 @@
 #!/bin/sh
-addgroup -S ftp &>/dev/null
-addgroup vsftp ftp &>/dev/null
-adduser -S -h /var/lib/ftp -s /sbin/nologin -G ftp -g vsftp vsftp &>/dev/null
+
+addgroup -S ftp 2>/dev/null
+addgroup vsftp ftp 2>/dev/null
+adduser -S -h /var/lib/ftp -s /sbin/nologin -G ftp -g vsftp vsftp 2>/dev/null
+
 exit 0
diff --git a/main/ympd/ympd.pre-install b/main/ympd/ympd.pre-install
index 369f25d945..a9a6edb409 100644
--- a/main/ympd/ympd.pre-install
+++ b/main/ympd/ympd.pre-install
@@ -1,3 +1,5 @@
 #!/bin/sh
+
 adduser -S -H -D -s /sbin/nologin -G audio -g ympd ympd 2>/dev/null
+
 exit 0
diff --git a/main/zabbix/zabbix-agent.pre-install b/main/zabbix/zabbix-agent.pre-install
index a63d884e02..7cc5be2f89 100644
--- a/main/zabbix/zabbix-agent.pre-install
+++ b/main/zabbix/zabbix-agent.pre-install
@@ -2,5 +2,5 @@
 
 addgroup -S zabbix 2>/dev/null
 adduser -S -H -h /dev/null -s /sbin/nologin -D -G zabbix -g zabbix zabbix 2>/dev/null
-addgroup -g 30 zabbix 2>/dev/null
+
 exit 0
diff --git a/main/zabbix/zabbix.pre-install b/main/zabbix/zabbix.pre-install
index 30851f153c..7cc5be2f89 100644
--- a/main/zabbix/zabbix.pre-install
+++ b/main/zabbix/zabbix.pre-install
@@ -2,4 +2,5 @@
 
 addgroup -S zabbix 2>/dev/null
 adduser -S -H -h /dev/null -s /sbin/nologin -D -G zabbix -g zabbix zabbix 2>/dev/null
+
 exit 0
diff --git a/main/znc/znc.pre-install b/main/znc/znc.pre-install
index c0e1fa5f6b..17c3bbc694 100644
--- a/main/znc/znc.pre-install
+++ b/main/znc/znc.pre-install
@@ -1,3 +1,5 @@
 #!/bin/sh
+
 adduser -S -H -D -s /sbin/nologin -g znc znc 2>/dev/null
+
 exit 0