Mail archive
alpine-aports

[alpine-aports] [PATCH 5/7] Improve consistency of scripts using adduser/addgroup.

From: Przemyslaw Pawelczyk <przemoc_at_zoho.com>
Date: Sat, 23 Apr 2016 13:13:39 +0200

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.
---
 community/caddy/caddy.pre-install                         |  2 ++
 community/davfs2/davfs2.pre-install                       |  5 ++---
 community/docker-registry/docker-registry.pre-install     |  1 +
 community/docker/docker.pre-install                       |  5 ++---
 community/domoticz/domoticz.pre-install                   |  2 ++
 community/icinga2/icinga2.pre-install                     |  4 +++-
 community/minetest/minetest-server.pre-install            |  2 ++
 community/oscam/oscam.pre-install                         |  2 ++
 community/seafile/seafile-server.pre-install              |  1 +
 community/smstools/smstools.pre-install                   |  8 +++++---
 community/sniproxy/sniproxy.pre-install                   |  2 ++
 community/sword/sword.pre-install                         |  5 ++++-
 community/syncthing/syncthing.pre-install                 |  2 ++
 community/tvheadend/tvheadend.pre-install                 |  2 ++
 main/abuild/abuild.pre-install                            |  5 ++---
 main/alpine-baselayout/alpine-baselayout.pre-install      |  5 ++---
 main/alpine-baselayout/alpine-baselayout.pre-upgrade      |  6 +++---
 main/amavisd-new/amavisd-new.pre-install                  |  2 +-
 main/apache2/apache2.pre-install                          |  2 ++
 main/apache2/apache2.pre-upgrade                          |  1 +
 main/aports-build/aports-build.pre-install                |  1 +
 main/arpwatch/arpwatch.pre-install                        |  3 ++-
 main/asterisk/asterisk.pre-install                        |  1 +
 main/asterisk/asterisk.pre-upgrade                        |  1 +
 main/atheme-iris/atheme-iris.pre-install                  |  3 ++-
 main/backuppc/backuppc.pre-install                        |  6 ++++--
 main/bacula-client/bacula-client.pre-install              |  2 ++
 main/bacula/bacula.pre-install                            |  2 ++
 main/bind/bind.pre-install                                |  2 +-
 main/charybdis/charybdis.pre-install                      |  2 ++
 main/chrony/chrony.pre-install                            |  1 +
 main/clamav/clamav-daemon.pre-install                     |  1 +
 main/clamav/clamav-db.pre-install                         |  1 +
 main/clamav/freshclam.pre-install                         |  1 +
 main/clamsmtp/clamsmtp.pre-install                        |  1 +
 main/clamsmtp/clamsmtp.pre-upgrade                        |  1 +
 main/coova-chilli/coova-chilli.pre-install                |  3 ++-
 main/cups/cups.pre-install                                |  1 +
 main/cvechecker/cvechecker.pre-install                    |  7 +++++--
 main/dansguardian/dansguardian.pre-install                |  3 ++-
 main/dbus/dbus.pre-install                                |  1 +
 main/dhcp/dhcp.pre-install                                |  2 +-
 main/distcc/distcc.pre-install                            |  1 +
 main/djbdns/dnscache.pre-install                          |  2 +-
 main/djbdns/tinydns.pre-install                           |  2 +-
 main/dnsmasq/dnsmasq.pre-install                          |  1 +
 main/dovecot/dovecot.pre-install                          |  1 +
 main/ez-ipupdate/ez-ipupdate.pre-install                  |  2 +-
 main/fetchmail/fetchmail.pre-install                      |  1 +
 main/freeradius/freeradius.pre-install                    |  2 +-
 main/gdnsd/gdnsd.pre-install                              |  1 +
 main/gitolite/gitolite.pre-install                        |  2 ++
 main/gnats/gnats.pre-install                              |  1 +
 main/gross/gross.pre-install                              |  2 ++
 main/haproxy/haproxy.pre-install                          |  1 +
 main/haproxy/haproxy.pre-upgrade                          |  1 +
 main/icecast/icecast.pre-install                          |  2 +-
 main/ircservices/ircservices.pre-install                  |  2 +-
 main/kamailio/kamailio.pre-install                        |  2 +-
 main/libgphoto2/libgphoto2.pre-install                    |  5 ++---
 main/libvirt/libvirt.post-install                         |  4 +++-
 main/logcheck/logcheck.pre-install                        |  1 +
 main/mariadb/mariadb.pre-install                          |  2 +-
 main/memcached/memcached.pre-install                      |  2 +-
 main/minidlna/minidlna.pre-install                        |  1 +
 main/mlmmj/mlmmj.pre-install                              |  1 +
 main/mosquitto/mosquitto.pre-install                      |  1 +
 main/mpd/mpd.pre-install                                  |  4 +++-
 main/mumble/murmur.pre-install                            |  6 ++++--
 main/nagios/nagios.pre-install                            |  1 +
 main/ngircd/ngircd.pre-install                            |  1 +
 main/nrpe/nrpe.pre-install                                |  1 +
 main/nsd/nsd.pre-install                                  |  2 ++
 main/nss-pam-ldapd/nss-pam-ldapd.pre-install              |  1 +
 main/ntop/ntop.pre-install                                |  2 ++
 main/open-vm-tools/open-vm-tools.pre-install              |  3 ++-
 main/openntpd/openntpd.pre-install                        |  2 +-
 main/opensmtpd/opensmtpd.pre-install                      |  2 --
 main/opentracker/opentracker.pre-install                  |  2 +-
 main/openvpn/openvpn.pre-install                          |  1 +
 main/pcsc-lite/pcsc-lite.pre-install                      |  1 +
 main/pdnsd/pdnsd.pre-install                              |  1 +
 main/postfix/postfix.pre-install                          |  1 -
 main/postgrey/postgrey.pre-install                        |  2 +-
 main/privoxy/privoxy.pre-install                          |  2 +-
 main/qemu/qemu.pre-install                                |  4 +++-
 main/quagga-nhrp/quagga-nhrp.pre-install                  |  2 +-
 main/quagga/quagga.pre-install                            |  2 +-
 main/radvd/radvd.pre-install                              |  2 ++
 main/redis/redis.pre-install                              |  1 +
 main/rpcbind/rpcbind.pre-install                          |  1 +
 main/rt4/rt4.pre-install                                  |  1 +
 main/rtnppd/rtnppd.pre-install                            |  1 +
 main/rtpproxy/rtpproxy.pre-install                        |  1 +
 main/sems/sems.pre-install                                |  8 ++------
 main/sircbot/sircbot.pre-install                          |  1 +
 main/smokeping/smokeping.pre-install                      |  1 +
 main/snmptt/snmptt.pre-install                            |  4 +++-
 main/snort/snort.pre-install                              |  1 +
 main/squark/squark.post-install                           |  5 ++++-
 main/squid/squid.pre-install                              |  5 +++--
 main/squid/squid.pre-upgrade                              |  5 +++--
 main/strongswan/strongswan.pre-install                    |  8 ++------
 main/subversion/subversion.pre-install                    |  2 +-
 main/trac/trac.pre-install                                |  1 +
 main/umurmur/umurmur.post-install                         |  6 ++++--
 main/unbound/unbound.pre-install                          |  1 +
 main/uvncrepeater/uvncrepeater.pre-install                |  2 +-
 main/varnish/varnish.pre-install                          |  1 +
 main/vlc/vlc-daemon.pre-install                           |  2 ++
 main/vsftpd/vsftpd.pre-install                            |  8 +++++---
 main/ympd/ympd.pre-install                                |  2 ++
 main/zabbix/zabbix-agent.pre-install                      |  2 +-
 main/zabbix/zabbix.pre-install                            |  1 +
 main/znc/znc.pre-install                                  |  2 ++
 testing/3proxy/3proxy.pre-install                         |  2 +-
 testing/at/at.pre-install                                 | 15 +++------------
 testing/bitcoin/bitcoin.pre-install                       |  3 ++-
 testing/buildbot-slave/buildbot-slave.pre-install         |  3 ++-
 testing/buildbot/buildbot.pre-install                     |  3 ++-
 testing/clapf/clapf.pre-install                           |  2 ++
 testing/cluster-glue/cluster-glue.pre-install             |  1 -
 testing/consul/consul.pre-install                         |  6 +++---
 testing/crtmpserver/crtmpserver.pre-install               |  2 ++
 testing/dante/dante-server.pre-install                    |  1 +
 .../darwin-streaming-server.post-install                  |  6 ++++--
 testing/dbmail/dbmail.pre-install                         |  2 +-
 testing/dnscrypt-proxy/dnscrypt-proxy.pre-install         |  2 ++
 testing/drizzle/drizzle.post-install                      |  8 ++++++--
 testing/dspam/dspam.pre-install                           |  2 +-
 testing/ejabberd/ejabberd.pre-install                     |  4 +++-
 testing/elasticsearch/elasticsearch.pre-install           |  4 ++--
 testing/emby/emby.pre-install                             |  2 ++
 testing/fcron/fcron.pre-install                           |  6 ++++--
 testing/gdnsd/gdnsd.pre-install                           |  1 +
 testing/gogs/gogs.pre-install                             |  6 ++++--
 testing/lightdm/lightdm.pre-install                       |  2 ++
 testing/lizardfs/lizardfs.pre-install                     |  1 +
 testing/lshell/lshell.pre-install                         |  2 ++
 testing/lusca/lusca.pre-install                           |  5 +++--
 testing/lusca/lusca.pre-upgrade                           |  5 +++--
 testing/milter-greylist/milter-greylist.pre-install       |  6 ++++--
 testing/mlocate/mlocate.pre-install                       |  2 ++
 testing/mongodb/mongodb.pre-install                       |  5 +++--
 testing/motion/motion.pre-install                         |  5 +++--
 testing/namecoin/namecoin.pre-install                     |  3 ++-
 testing/ntopng/ntopng.pre-install                         |  2 ++
 testing/nut/nut.pre-install                               |  1 +
 testing/opennebula/opennebula-node-kvm.pre-install        |  3 ++-
 testing/opennebula/opennebula.pre-install                 |  3 ++-
 testing/opensips/opensips.pre-install                     |  2 +-
 testing/openxcap/openxcap.pre-install                     |  1 +
 testing/pdns/pdns.pre-install                             |  1 +
 testing/prosody/prosody.pre-install                       |  2 ++
 testing/qpage/qpage.pre-install                           |  4 +++-
 testing/quicktun/quicktun.pre-install                     |  7 ++++---
 testing/radicale/radicale.pre-install                     |  2 ++
 testing/rancid/rancid.pre-install                         |  1 +
 testing/rrdbot/rrdbot.pre-install                         |  2 +-
 testing/rutorrent/rutorrent.pre-install                   |  3 ++-
 testing/sipwise-sems/sipwise-sems.pre-install             |  8 ++------
 testing/socklog/socklog.post-install                      |  1 +
 testing/stunnel/stunnel.pre-install                       |  1 +
 testing/thttpd/thttpd.pre-install                         |  2 ++
 testing/tor/tor.pre-install                               |  3 ++-
 testing/tvheadend-git/tvheadend-git.pre-install           |  2 ++
 testing/udevil/udevil.pre-install                         |  3 ++-
 testing/vault/vault.pre-install                           |  1 +
 testing/vnstat/vnstat.pre-install                         |  1 +
 testing/wt/wt.pre-install                                 |  2 ++
 testing/x2goserver/x2goserver.pre-install                 |  6 ++++--
 testing/zabbix/zabbix-agent.pre-install                   |  1 +
 testing/zabbix/zabbix.pre-install                         |  1 +
 unmaintained/apache-couchdb/apache-couchdb.post-install   |  6 ++++--
 unmaintained/ejabberd-git/ejabberd-git.pre-install        |  4 +++-
 unmaintained/kde-workspace/kde-workspace.pre-install      |  2 ++
 unmaintained/shadowircd/shadowircd.pre-install            |  2 ++
 177 files changed, 318 insertions(+), 150 deletions(-)
diff --git a/community/caddy/caddy.pre-install b/community/caddy/caddy.pre-install
index 7bf003d..dc78350 100644
--- a/community/caddy/caddy.pre-install
+++ b/community/caddy/caddy.pre-install
_at_@ -1,4 +1,6 @@
 #!/bin/sh
+
 adduser -S -h /var/lib/caddy -D -s /sbin/nologin -g caddy caddy 2>/dev/null
 adduser caddy www-data 2>/dev/null
+
 exit 0
diff --git a/community/davfs2/davfs2.pre-install b/community/davfs2/davfs2.pre-install
index 062477c..2accd54 100755
--- a/community/davfs2/davfs2.pre-install
+++ b/community/davfs2/davfs2.pre-install
_at_@ -1,6 +1,5 @@
 #!/bin/sh
 
-if ! getent group davfs2 >/dev/null; then
-	addgroup -S davfs2
-fi
+addgroup -S davfs2 2>/dev/null
+
 exit 0
diff --git a/community/docker-registry/docker-registry.pre-install b/community/docker-registry/docker-registry.pre-install
index 3bc3eab..5d1fbbb 100644
--- a/community/docker-registry/docker-registry.pre-install
+++ b/community/docker-registry/docker-registry.pre-install
_at_@ -2,4 +2,5 @@
 
 addgroup -S docker-registry 2>/dev/null
 adduser -S -H -h /dev/null -s /sbin/nologin -D -G docker-registry -g docker-registry docker-registry 2>/dev/null
+
 exit 0
diff --git a/community/docker/docker.pre-install b/community/docker/docker.pre-install
index 8a1dec6..8cd2d63 100644
--- a/community/docker/docker.pre-install
+++ b/community/docker/docker.pre-install
_at_@ -1,6 +1,5 @@
 #!/bin/sh
 
-if ! getent group docker >/dev/null; then
-	addgroup -S docker
-fi
+addgroup -S docker 2>/dev/null
+
 exit 0
diff --git a/community/domoticz/domoticz.pre-install b/community/domoticz/domoticz.pre-install
index 077e0fa..5162f88 100644
--- a/community/domoticz/domoticz.pre-install
+++ b/community/domoticz/domoticz.pre-install
_at_@ -1,3 +1,5 @@
 #!/bin/sh
+
 adduser -S -h /var/lib/domoticz -D -s /sbin/nologin -g domoticz domoticz 2>/dev/null
+
 exit 0
diff --git a/community/icinga2/icinga2.pre-install b/community/icinga2/icinga2.pre-install
index e84e09e..7b0002c 100644
--- a/community/icinga2/icinga2.pre-install
+++ b/community/icinga2/icinga2.pre-install
_at_@ -1,6 +1,8 @@
 #!/bin/sh
+
 addgroup -S icinga 2>/dev/null
 addgroup -S icingacmd 2>/dev/null
 adduser -S -G icinga -H -h /var/spool/icinga2 -s /sbin/nologin -D -g icinga icinga 2>/dev/null
-adduser icinga icingacmd 2>/dev/null 2>/dev/null
+adduser icinga icingacmd 2>/dev/null
+
 exit 0
diff --git a/community/minetest/minetest-server.pre-install b/community/minetest/minetest-server.pre-install
index 4cde639..da9a025 100644
--- a/community/minetest/minetest-server.pre-install
+++ b/community/minetest/minetest-server.pre-install
_at_@ -1,3 +1,5 @@
 #!/bin/sh
+
 adduser -S -s /sbin/nologin -D -h /var/lib/minetest -g minetest minetest games 2>/dev/null
+
 exit 0
diff --git a/community/oscam/oscam.pre-install b/community/oscam/oscam.pre-install
index 2f5f5d9..4e0c49a 100644
--- a/community/oscam/oscam.pre-install
+++ b/community/oscam/oscam.pre-install
_at_@ -1,4 +1,6 @@
 #!/bin/sh
+
 adduser -S -H -D -s /sbin/nologin -g oscam oscam 2>/dev/null
 addgroup oscam usb 2>/dev/null
+
 exit 0
diff --git a/community/seafile/seafile-server.pre-install b/community/seafile/seafile-server.pre-install
index 66e7a2c..b5c1b4f 100644
--- a/community/seafile/seafile-server.pre-install
+++ b/community/seafile/seafile-server.pre-install
_at_@ -4,4 +4,5 @@ SEAFILE_HOME=/var/lib/seafile
 
 addgroup -S -g 800 seafile 2>/dev/null
 adduser -S -h $SEAFILE_HOME -s /bin/sh -G seafile -g seafile -u 800 -D seafile 2>/dev/null
+
 exit 0
diff --git a/community/smstools/smstools.pre-install b/community/smstools/smstools.pre-install
index d9e1d36..0a5106f 100755
--- a/community/smstools/smstools.pre-install
+++ b/community/smstools/smstools.pre-install
_at_@ -1,5 +1,7 @@
 #!/bin/sh
-addgroup -S smsd &>/dev/null
-adduser -S -h /var/spool/sms -s /sbin/nologin -G smsd -D -g smsd smsd &>/dev/null
-adduser -G uucp smsd &>/dev/null
+
+addgroup -S smsd 2>/dev/null
+adduser -S -h /var/spool/sms -s /sbin/nologin -G smsd -D -g smsd smsd 2>/dev/null
+adduser -G uucp smsd 2>/dev/null
+
 exit 0
diff --git a/community/sniproxy/sniproxy.pre-install b/community/sniproxy/sniproxy.pre-install
index c56f31d..aa2f7df 100644
--- a/community/sniproxy/sniproxy.pre-install
+++ b/community/sniproxy/sniproxy.pre-install
_at_@ -1,4 +1,6 @@
 #!/bin/sh
+
 addgroup -S sniproxy 2>/dev/null
 adduser -S -h /var/log/sniproxy -s /bin/false -D -g sniproxy sniproxy 2>/dev/null
+
 exit 0
diff --git a/community/sword/sword.pre-install b/community/sword/sword.pre-install
index d8abdb5..2ebce6d 100755
--- a/community/sword/sword.pre-install
+++ b/community/sword/sword.pre-install
_at_@ -1,3 +1,6 @@
 #!/bin/sh
+
 echo "Adding 'sword' group for installing SWORD modules systemwide"
-addgroup -S sword 2>/dev/null >&2 || true
+addgroup -S sword 2>/dev/null
+
+exit 0
diff --git a/community/syncthing/syncthing.pre-install b/community/syncthing/syncthing.pre-install
index 002a54f..ab337cc 100644
--- a/community/syncthing/syncthing.pre-install
+++ b/community/syncthing/syncthing.pre-install
_at_@ -1,3 +1,5 @@
 #!/bin/sh
+
 adduser -S -H -h /var/lib/syncthing -s /sbin/nologin -D -g syncthing syncthing 2>/dev/null
+
 exit 0
diff --git a/community/tvheadend/tvheadend.pre-install b/community/tvheadend/tvheadend.pre-install
index 6fee0b4..6b64423 100644
--- a/community/tvheadend/tvheadend.pre-install
+++ b/community/tvheadend/tvheadend.pre-install
_at_@ -1,4 +1,6 @@
 #!/bin/sh
+
 adduser -S -G video -s /sbin/nologin -H -h /usr/share/tvheadend -g tvheadend tvheadend 2>/dev/null
 addgroup tvheadend usb 2>/dev/null
+
 exit 0
diff --git a/main/abuild/abuild.pre-install b/main/abuild/abuild.pre-install
index fb2cf9e..fd3d39a 100644
--- a/main/abuild/abuild.pre-install
+++ b/main/abuild/abuild.pre-install
_at_@ -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 3b9f141..fc0d0b9 100644
--- a/main/alpine-baselayout/alpine-baselayout.pre-install
+++ b/main/alpine-baselayout/alpine-baselayout.pre-install
_at_@ -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 8a7098f..f7c8db8 100644
--- a/main/alpine-baselayout/alpine-baselayout.pre-upgrade
+++ b/main/alpine-baselayout/alpine-baselayout.pre-upgrade
_at_@ -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 d0c0700..5223f9f 100755
--- a/main/amavisd-new/amavisd-new.pre-install
+++ b/main/amavisd-new/amavisd-new.pre-install
_at_@ -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 cb80323..f142d89 100644
--- a/main/apache2/apache2.pre-install
+++ b/main/apache2/apache2.pre-install
_at_@ -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 dbc1d68..bb3dba9 100644
--- a/main/apache2/apache2.pre-upgrade
+++ b/main/apache2/apache2.pre-upgrade
_at_@ -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 a4928eb..2fdf497 100644
--- a/main/aports-build/aports-build.pre-install
+++ b/main/aports-build/aports-build.pre-install
_at_@ -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 d75874f..56fdfe3 100644
--- a/main/arpwatch/arpwatch.pre-install
+++ b/main/arpwatch/arpwatch.pre-install
_at_@ -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 935466d..df228c2 100644
--- a/main/asterisk/asterisk.pre-install
+++ b/main/asterisk/asterisk.pre-install
_at_@ -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 781d5d8..02414e6 100644
--- a/main/asterisk/asterisk.pre-upgrade
+++ b/main/asterisk/asterisk.pre-upgrade
_at_@ -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 4198df2..ef8ea56 100644
--- a/main/atheme-iris/atheme-iris.pre-install
+++ b/main/atheme-iris/atheme-iris.pre-install
_at_@ -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 32440ee..2ed220e 100644
--- a/main/backuppc/backuppc.pre-install
+++ b/main/backuppc/backuppc.pre-install
_at_@ -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 7827de6..363af9d 100644
--- a/main/bacula-client/bacula-client.pre-install
+++ b/main/bacula-client/bacula-client.pre-install
_at_@ -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 7827de6..363af9d 100644
--- a/main/bacula/bacula.pre-install
+++ b/main/bacula/bacula.pre-install
_at_@ -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 116d51e..49e398b 100644
--- a/main/bind/bind.pre-install
+++ b/main/bind/bind.pre-install
_at_@ -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 83ffff3..2dab19b 100644
--- a/main/charybdis/charybdis.pre-install
+++ b/main/charybdis/charybdis.pre-install
_at_@ -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 41e01c6..32b8fe3 100644
--- a/main/chrony/chrony.pre-install
+++ b/main/chrony/chrony.pre-install
_at_@ -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 5ef833a..0442c39 100644
--- a/main/clamav/clamav-daemon.pre-install
+++ b/main/clamav/clamav-daemon.pre-install
_at_@ -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 f46eabe..b442a43 100644
--- a/main/clamav/clamav-db.pre-install
+++ b/main/clamav/clamav-db.pre-install
_at_@ -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 5ef833a..0442c39 100644
--- a/main/clamav/freshclam.pre-install
+++ b/main/clamav/freshclam.pre-install
_at_@ -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 f46eabe..b442a43 100644
--- a/main/clamsmtp/clamsmtp.pre-install
+++ b/main/clamsmtp/clamsmtp.pre-install
_at_@ -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 c673e27..a58c165 100644
--- a/main/clamsmtp/clamsmtp.pre-upgrade
+++ b/main/clamsmtp/clamsmtp.pre-upgrade
_at_@ -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 15de617..65624f3 100644
--- a/main/coova-chilli/coova-chilli.pre-install
+++ b/main/coova-chilli/coova-chilli.pre-install
_at_@ -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 4b099d8..cdb75ca 100644
--- a/main/cups/cups.pre-install
+++ b/main/cups/cups.pre-install
_at_@ -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 b698117..7cc6f41 100644
--- a/main/cvechecker/cvechecker.pre-install
+++ b/main/cvechecker/cvechecker.pre-install
_at_@ -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 e897f8c..201fdfc 100644
--- a/main/dansguardian/dansguardian.pre-install
+++ b/main/dansguardian/dansguardian.pre-install
_at_@ -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 7fdb08a..c736ea0 100644
--- a/main/dbus/dbus.pre-install
+++ b/main/dbus/dbus.pre-install
_at_@ -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 5aaa6c4..83ba7f0 100644
--- a/main/dhcp/dhcp.pre-install
+++ b/main/dhcp/dhcp.pre-install
_at_@ -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 b408b4a..15d591d 100644
--- a/main/distcc/distcc.pre-install
+++ b/main/distcc/distcc.pre-install
_at_@ -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 106fc29..1b58fff 100644
--- a/main/djbdns/dnscache.pre-install
+++ b/main/djbdns/dnscache.pre-install
_at_@ -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 8676fb4..094f0d8 100644
--- a/main/djbdns/tinydns.pre-install
+++ b/main/djbdns/tinydns.pre-install
_at_@ -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 43f60b8..1263e54 100644
--- a/main/dnsmasq/dnsmasq.pre-install
+++ b/main/dnsmasq/dnsmasq.pre-install
_at_@ -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 481132b..d3c3468 100644
--- a/main/dovecot/dovecot.pre-install
+++ b/main/dovecot/dovecot.pre-install
_at_@ -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 23d9fae..b6b7e22 100644
--- a/main/ez-ipupdate/ez-ipupdate.pre-install
+++ b/main/ez-ipupdate/ez-ipupdate.pre-install
_at_@ -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 67681f8..d9c1aed 100644
--- a/main/fetchmail/fetchmail.pre-install
+++ b/main/fetchmail/fetchmail.pre-install
_at_@ -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 f02c2c0..8b09032 100644
--- a/main/freeradius/freeradius.pre-install
+++ b/main/freeradius/freeradius.pre-install
_at_@ -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 040e7f1..8e8af59 100644
--- a/main/gdnsd/gdnsd.pre-install
+++ b/main/gdnsd/gdnsd.pre-install
_at_@ -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 2d155ab..80a3a71 100644
--- a/main/gitolite/gitolite.pre-install
+++ b/main/gitolite/gitolite.pre-install
_at_@ -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 81093a4..a66e2d9 100644
--- a/main/gnats/gnats.pre-install
+++ b/main/gnats/gnats.pre-install
_at_@ -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 d3a5f85..22fecf4 100644
--- a/main/gross/gross.pre-install
+++ b/main/gross/gross.pre-install
_at_@ -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 72b8ab0..162855a 100644
--- a/main/haproxy/haproxy.pre-install
+++ b/main/haproxy/haproxy.pre-install
_at_@ -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 72b8ab0..162855a 100644
--- a/main/haproxy/haproxy.pre-upgrade
+++ b/main/haproxy/haproxy.pre-upgrade
_at_@ -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 8734c1e..562611b 100644
--- a/main/icecast/icecast.pre-install
+++ b/main/icecast/icecast.pre-install
_at_@ -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 4f6144a..2f08491 100644
--- a/main/ircservices/ircservices.pre-install
+++ b/main/ircservices/ircservices.pre-install
_at_@ -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 19d11f5..e38239d 100644
--- a/main/kamailio/kamailio.pre-install
+++ b/main/kamailio/kamailio.pre-install
_at_@ -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 a7d3144..c696fcd 100644
--- a/main/libgphoto2/libgphoto2.pre-install
+++ b/main/libgphoto2/libgphoto2.pre-install
_at_@ -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 0be14b9..a747701 100755
--- a/main/libvirt/libvirt.post-install
+++ b/main/libvirt/libvirt.post-install
_at_@ -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 ea6028c..818fda5 100644
--- a/main/logcheck/logcheck.pre-install
+++ b/main/logcheck/logcheck.pre-install
_at_@ -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 e4f16d2..14677b1 100644
--- a/main/mariadb/mariadb.pre-install
+++ b/main/mariadb/mariadb.pre-install
_at_@ -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 df22cd5..4440f4e 100644
--- a/main/memcached/memcached.pre-install
+++ b/main/memcached/memcached.pre-install
_at_@ -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 4423a73..4fc20e6 100644
--- a/main/minidlna/minidlna.pre-install
+++ b/main/minidlna/minidlna.pre-install
_at_@ -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 046a821..7a7b32c 100644
--- a/main/mlmmj/mlmmj.pre-install
+++ b/main/mlmmj/mlmmj.pre-install
_at_@ -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 a0a8f72..518d9f2 100644
--- a/main/mosquitto/mosquitto.pre-install
+++ b/main/mosquitto/mosquitto.pre-install
_at_@ -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 7e012f8..934307b 100644
--- a/main/mpd/mpd.pre-install
+++ b/main/mpd/mpd.pre-install
_at_@ -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 cb0e0eb..980ed34 100755
--- a/main/mumble/murmur.pre-install
+++ b/main/mumble/murmur.pre-install
_at_@ -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 d9c0f3c..2e2dbbf 100644
--- a/main/nagios/nagios.pre-install
+++ b/main/nagios/nagios.pre-install
_at_@ -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 036c9ab..bb5f05a 100644
--- a/main/ngircd/ngircd.pre-install
+++ b/main/ngircd/ngircd.pre-install
_at_@ -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 7ee629b..e00f960 100644
--- a/main/nrpe/nrpe.pre-install
+++ b/main/nrpe/nrpe.pre-install
_at_@ -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 106ac00..a94f6e0 100644
--- a/main/nsd/nsd.pre-install
+++ b/main/nsd/nsd.pre-install
_at_@ -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 5a7076f..58b4216 100644
--- a/main/nss-pam-ldapd/nss-pam-ldapd.pre-install
+++ b/main/nss-pam-ldapd/nss-pam-ldapd.pre-install
_at_@ -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 2386dc8..9af92bb 100755
--- a/main/ntop/ntop.pre-install
+++ b/main/ntop/ntop.pre-install
_at_@ -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 15fbca3..39b4850 100644
--- a/main/open-vm-tools/open-vm-tools.pre-install
+++ b/main/open-vm-tools/open-vm-tools.pre-install
_at_@ -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 997e7bf..c3d9986 100644
--- a/main/openntpd/openntpd.pre-install
+++ b/main/openntpd/openntpd.pre-install
_at_@ -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 af0620e..8cbebc1 100644
--- a/main/opensmtpd/opensmtpd.pre-install
+++ b/main/opensmtpd/opensmtpd.pre-install
_at_@ -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 2e591db..4a573b2 100644
--- a/main/opentracker/opentracker.pre-install
+++ b/main/opentracker/opentracker.pre-install
_at_@ -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 37e0bf2..ff553b8 100644
--- a/main/openvpn/openvpn.pre-install
+++ b/main/openvpn/openvpn.pre-install
_at_@ -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 192e10e..2b90929 100644
--- a/main/pcsc-lite/pcsc-lite.pre-install
+++ b/main/pcsc-lite/pcsc-lite.pre-install
_at_@ -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 b916dab..164ef02 100644
--- a/main/pdnsd/pdnsd.pre-install
+++ b/main/pdnsd/pdnsd.pre-install
_at_@ -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 6a59570..d00c3eb 100644
--- a/main/postfix/postfix.pre-install
+++ b/main/postfix/postfix.pre-install
_at_@ -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 e745acf..f70564c 100644
--- a/main/postgrey/postgrey.pre-install
+++ b/main/postgrey/postgrey.pre-install
_at_@ -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 72b4ac1..3f6c759 100644
--- a/main/privoxy/privoxy.pre-install
+++ b/main/privoxy/privoxy.pre-install
_at_@ -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 d644941..9aae4a4 100644
--- a/main/qemu/qemu.pre-install
+++ b/main/qemu/qemu.pre-install
_at_@ -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 f8340fa..f3b4471 100644
--- a/main/quagga-nhrp/quagga-nhrp.pre-install
+++ b/main/quagga-nhrp/quagga-nhrp.pre-install
_at_@ -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 f8340fa..f3b4471 100644
--- a/main/quagga/quagga.pre-install
+++ b/main/quagga/quagga.pre-install
_at_@ -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 cc06c7d..44c76a2 100644
--- a/main/radvd/radvd.pre-install
+++ b/main/radvd/radvd.pre-install
_at_@ -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 2a59934..b6cbd05 100644
--- a/main/redis/redis.pre-install
+++ b/main/redis/redis.pre-install
_at_@ -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 51fae45..fe6a826 100644
--- a/main/rpcbind/rpcbind.pre-install
+++ b/main/rpcbind/rpcbind.pre-install
_at_@ -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 b62454d..8832783 100644
--- a/main/rt4/rt4.pre-install
+++ b/main/rt4/rt4.pre-install
_at_@ -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 faf0431..ec21795 100644
--- a/main/rtnppd/rtnppd.pre-install
+++ b/main/rtnppd/rtnppd.pre-install
_at_@ -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 cbf1e52..93a10a8 100644
--- a/main/rtpproxy/rtpproxy.pre-install
+++ b/main/rtpproxy/rtpproxy.pre-install
_at_@ -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 b3b5c78..83d4f74 100644
--- a/main/sems/sems.pre-install
+++ b/main/sems/sems.pre-install
_at_@ -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 8bfedcc..c9db472 100644
--- a/main/sircbot/sircbot.pre-install
+++ b/main/sircbot/sircbot.pre-install
_at_@ -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 3158cc4..f13ff10 100644
--- a/main/smokeping/smokeping.pre-install
+++ b/main/smokeping/smokeping.pre-install
_at_@ -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 efc8a6e..e0c65c8 100644
--- a/main/snmptt/snmptt.pre-install
+++ b/main/snmptt/snmptt.pre-install
_at_@ -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 47608ed..bd0791b 100644
--- a/main/snort/snort.pre-install
+++ b/main/snort/snort.pre-install
_at_@ -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 3c40694..f4f8798 100755
--- a/main/squark/squark.post-install
+++ b/main/squark/squark.post-install
_at_@ -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 3ac1f9f..11ff2bc 100644
--- a/main/squid/squid.pre-install
+++ b/main/squid/squid.pre-install
_at_@ -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 3ac1f9f..11ff2bc 100644
--- a/main/squid/squid.pre-upgrade
+++ b/main/squid/squid.pre-upgrade
_at_@ -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 12371d1..83b9328 100644
--- a/main/strongswan/strongswan.pre-install
+++ b/main/strongswan/strongswan.pre-install
_at_@ -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 3109006..955baee 100644
--- a/main/subversion/subversion.pre-install
+++ b/main/subversion/subversion.pre-install
_at_@ -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 0fa8f02..05e9f2a 100644
--- a/main/trac/trac.pre-install
+++ b/main/trac/trac.pre-install
_at_@ -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 d9a350a..771aed1 100755
--- a/main/umurmur/umurmur.post-install
+++ b/main/umurmur/umurmur.post-install
_at_@ -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 4cd64d5..63c00e9 100644
--- a/main/unbound/unbound.pre-install
+++ b/main/unbound/unbound.pre-install
_at_@ -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 0c856f8..052cd7f 100644
--- a/main/uvncrepeater/uvncrepeater.pre-install
+++ b/main/uvncrepeater/uvncrepeater.pre-install
_at_@ -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 74ccfd1..4e34a09 100644
--- a/main/varnish/varnish.pre-install
+++ b/main/varnish/varnish.pre-install
_at_@ -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 33f99df..778c27a 100644
--- a/main/vlc/vlc-daemon.pre-install
+++ b/main/vlc/vlc-daemon.pre-install
_at_@ -1,6 +1,7 @@
 #!/bin/sh
 
 groups="vlc audio video"
+
 for group in $groups; do
 	addgroup -S $group 2>/dev/null
 done
_at_@ -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 0ed59d9..c6e45f1 100755
--- a/main/vsftpd/vsftpd.pre-install
+++ b/main/vsftpd/vsftpd.pre-install
_at_@ -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 369f25d..a9a6edb 100644
--- a/main/ympd/ympd.pre-install
+++ b/main/ympd/ympd.pre-install
_at_@ -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 a63d884..7cc5be2 100644
--- a/main/zabbix/zabbix-agent.pre-install
+++ b/main/zabbix/zabbix-agent.pre-install
_at_@ -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 30851f1..7cc5be2 100644
--- a/main/zabbix/zabbix.pre-install
+++ b/main/zabbix/zabbix.pre-install
_at_@ -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 c0e1fa5..17c3bbc 100644
--- a/main/znc/znc.pre-install
+++ b/main/znc/znc.pre-install
_at_@ -1,3 +1,5 @@
 #!/bin/sh
+
 adduser -S -H -D -s /sbin/nologin -g znc znc 2>/dev/null
+
 exit 0
diff --git a/testing/3proxy/3proxy.pre-install b/testing/3proxy/3proxy.pre-install
index 46e6ea5..c314228 100644
--- a/testing/3proxy/3proxy.pre-install
+++ b/testing/3proxy/3proxy.pre-install
_at_@ -2,5 +2,5 @@
 
 addgroup -S 3proxy 2>/dev/null
 adduser -S -G 3proxy -h /var/log/3proxy -s /sbin/nologin -D -g 3proxy 3proxy 2>/dev/null
-exit 0
 
+exit 0
diff --git a/testing/at/at.pre-install b/testing/at/at.pre-install
index a35aa48..e3c28ec 100644
--- a/testing/at/at.pre-install
+++ b/testing/at/at.pre-install
_at_@ -1,16 +1,7 @@
 #!/bin/sh
 
-if ! getent group at >/dev/null; then
-	addgroup -S at 2>/dev/null
-fi
-
-if ! getent passwd at >/dev/null; then
-	adduser -S -H -s /bin/false -D -g at at 2>/dev/null
-fi
-
-if [ -z `echo " $(groups at) " | grep ' at '`] ; then
-	addgroup at at 2>/dev/null
-fi
+addgroup -S at 2>/dev/null
+adduser -S -H -s /bin/false -D -g at at 2>/dev/null
+addgroup at at 2>/dev/null
 
 exit 0
-
diff --git a/testing/bitcoin/bitcoin.pre-install b/testing/bitcoin/bitcoin.pre-install
index f020a8b..9cf75bb 100644
--- a/testing/bitcoin/bitcoin.pre-install
+++ b/testing/bitcoin/bitcoin.pre-install
_at_@ -1,5 +1,6 @@
 #!/bin/sh
+
 addgroup -S bitcoin 2>/dev/null
 adduser -S -H -h /var/lib/bitcoin -g bitcoin -G bitcoin -D -s /sbin/nologin bitcoin 2>/dev/null
-exit 0
 
+exit 0
diff --git a/testing/buildbot-slave/buildbot-slave.pre-install b/testing/buildbot-slave/buildbot-slave.pre-install
index 40e2945..ca33aac 100644
--- a/testing/buildbot-slave/buildbot-slave.pre-install
+++ b/testing/buildbot-slave/buildbot-slave.pre-install
_at_@ -1,4 +1,5 @@
 #!/bin/sh
+
 adduser -S -H -h /home/buildbot -g buildbot -D -s /sbin/nologin buildbot 2>/dev/null
-exit 0
 
+exit 0
diff --git a/testing/buildbot/buildbot.pre-install b/testing/buildbot/buildbot.pre-install
index 40e2945..ca33aac 100644
--- a/testing/buildbot/buildbot.pre-install
+++ b/testing/buildbot/buildbot.pre-install
_at_@ -1,4 +1,5 @@
 #!/bin/sh
+
 adduser -S -H -h /home/buildbot -g buildbot -D -s /sbin/nologin buildbot 2>/dev/null
-exit 0
 
+exit 0
diff --git a/testing/clapf/clapf.pre-install b/testing/clapf/clapf.pre-install
index dff8c72..eec8afe 100644
--- a/testing/clapf/clapf.pre-install
+++ b/testing/clapf/clapf.pre-install
_at_@ -1,3 +1,5 @@
 #!/bin/sh
+
 adduser -S -H -s /bin/false -D -g clamav clamav 2>/dev/null
+
 exit 0
diff --git a/testing/cluster-glue/cluster-glue.pre-install b/testing/cluster-glue/cluster-glue.pre-install
index 2dff6b2..ce20da4 100644
--- a/testing/cluster-glue/cluster-glue.pre-install
+++ b/testing/cluster-glue/cluster-glue.pre-install
_at_@ -8,4 +8,3 @@ adduser -S -g hacluster hacluster \
 	2>/dev/null
 
 exit 0
-
diff --git a/testing/consul/consul.pre-install b/testing/consul/consul.pre-install
index 4d7a385..1b9ea9d 100644
--- a/testing/consul/consul.pre-install
+++ b/testing/consul/consul.pre-install
_at_@ -1,7 +1,7 @@
 #!/bin/sh
 
 # Create consul group and user
-addgroup -S consul 2> /dev/null
-adduser -S -h /var/consul -s /sbin/nologin -G consul -D -g consul consul 2> /dev/null
-exit 0
+addgroup -S consul 2>/dev/null
+adduser -S -h /var/consul -s /sbin/nologin -G consul -D -g consul consul 2>/dev/null
 
+exit 0
diff --git a/testing/crtmpserver/crtmpserver.pre-install b/testing/crtmpserver/crtmpserver.pre-install
index 643a6f8..e8dc1c7 100644
--- a/testing/crtmpserver/crtmpserver.pre-install
+++ b/testing/crtmpserver/crtmpserver.pre-install
_at_@ -1,3 +1,5 @@
 #!/bin/sh
+
 adduser -S -h /var/crtmpserver -s /bin/false -g rtmpd rtmpd 2>/dev/null
+
 exit 0
diff --git a/testing/dante/dante-server.pre-install b/testing/dante/dante-server.pre-install
index f657308..d11b163 100644
--- a/testing/dante/dante-server.pre-install
+++ b/testing/dante/dante-server.pre-install
_at_@ -2,4 +2,5 @@
 
 addgroup -S sockd 2>/dev/null
 adduser -S -H -h /dev/null -s /sbin/nologin -D -G sockd -g sockd sockd 2>/dev/null
+
 exit 0
diff --git a/testing/darwin-streaming-server/darwin-streaming-server.post-install b/testing/darwin-streaming-server/darwin-streaming-server.post-install
index 005bd35..3d4786e 100644
--- a/testing/darwin-streaming-server/darwin-streaming-server.post-install
+++ b/testing/darwin-streaming-server/darwin-streaming-server.post-install
_at_@ -1,4 +1,6 @@
 #!/bin/sh
-addgroup -S qtss &>/dev/null
-adduser -S -s /bin/false -G qtss -h /var/darwinstreaming -D -g qtss qtss &>/dev/null
+
+addgroup -S qtss 2>/dev/null
+adduser -S -s /bin/false -G qtss -h /var/darwinstreaming -D -g qtss qtss 2>/dev/null
+
 exit 0
diff --git a/testing/dbmail/dbmail.pre-install b/testing/dbmail/dbmail.pre-install
index 1f650df..bca9a6f 100644
--- a/testing/dbmail/dbmail.pre-install
+++ b/testing/dbmail/dbmail.pre-install
_at_@ -1,5 +1,5 @@
 #!/bin/sh
 
 adduser -S -s /bin/false -D -H -h /var/lib/dbmail -g dbmail dbmail 2>/dev/null
-exit 0
 
+exit 0
diff --git a/testing/dnscrypt-proxy/dnscrypt-proxy.pre-install b/testing/dnscrypt-proxy/dnscrypt-proxy.pre-install
index 3bee7f2..34a4de6 100644
--- a/testing/dnscrypt-proxy/dnscrypt-proxy.pre-install
+++ b/testing/dnscrypt-proxy/dnscrypt-proxy.pre-install
_at_@ -1,4 +1,6 @@
 #!/bin/sh
+
 addgroup -S dnscrypt 2>/dev/null
 adduser -S -H -h /var/empty -G dnscrypt -D -s /sbin/nologin -g dnscrypt dnscrypt 2>/dev/null
+
 exit 0
diff --git a/testing/drizzle/drizzle.post-install b/testing/drizzle/drizzle.post-install
index e7c7dcb..64016b2 100644
--- a/testing/drizzle/drizzle.post-install
+++ b/testing/drizzle/drizzle.post-install
_at_@ -1,2 +1,6 @@
-addgroup -S drizzle
-adduser -SDHG drizzle -g drizzle drizzle
+#!/bin/sh
+
+addgroup -S drizzle 2>/dev/null
+adduser -SDHG drizzle -g drizzle drizzle 2>/dev/null
+
+exit 0
diff --git a/testing/dspam/dspam.pre-install b/testing/dspam/dspam.pre-install
index d06ab90..e7a059c 100644
--- a/testing/dspam/dspam.pre-install
+++ b/testing/dspam/dspam.pre-install
_at_@ -2,5 +2,5 @@
 
 adduser -S -h /var/lib/dspam -s /bin/false -D -g dspam dspam 2>/dev/null
 chown dspam:dspam /var/lib/dspam
-exit 0
 
+exit 0
diff --git a/testing/ejabberd/ejabberd.pre-install b/testing/ejabberd/ejabberd.pre-install
index d4cab3c..efda04b 100644
--- a/testing/ejabberd/ejabberd.pre-install
+++ b/testing/ejabberd/ejabberd.pre-install
_at_@ -1,3 +1,5 @@
 #!/bin/sh
-adduser -S -H -h /var/lib/ejabberd -G ejabberd -D -g ejabberd ejabberd  2>/dev/null
+
+adduser -S -H -h /var/lib/ejabberd -G ejabberd -D -g ejabberd ejabberd 2>/dev/null
+
 exit 0
diff --git a/testing/elasticsearch/elasticsearch.pre-install b/testing/elasticsearch/elasticsearch.pre-install
index 63e023a..54cd0d8 100644
--- a/testing/elasticsearch/elasticsearch.pre-install
+++ b/testing/elasticsearch/elasticsearch.pre-install
_at_@ -1,7 +1,7 @@
 #!/bin/sh
 
-addgroup -S elastico
+addgroup -S elastico 2>/dev/null
 adduser -S -h /var/lib/elasticsearch -s /sbin/nologin -G elastico \
-	-g "added by apk for elasticsearch" -DH elastico
+	-g "added by apk for elasticsearch" -DH elastico 2>/dev/null
 
 exit 0
diff --git a/testing/emby/emby.pre-install b/testing/emby/emby.pre-install
index cfe5965..70555e4 100644
--- a/testing/emby/emby.pre-install
+++ b/testing/emby/emby.pre-install
_at_@ -1,5 +1,7 @@
 #!/bin/sh
+
 addgroup -S emby 2>/dev/null
 adduser -S -D -h /var/lib/emby -s /sbin/nologin -g "Emby media server" \
 	-G emby emby 2>/dev/null
+
 exit 0
diff --git a/testing/fcron/fcron.pre-install b/testing/fcron/fcron.pre-install
index d513ffd..d4d66fd 100644
--- a/testing/fcron/fcron.pre-install
+++ b/testing/fcron/fcron.pre-install
_at_@ -1,4 +1,6 @@
 #!/bin/sh
-adduser -S -D -g fcron fcron -H -s /sbin/nologin  2>/dev/null
-addgroup -S fcron
+
+adduser -S -D -g fcron fcron -H -s /sbin/nologin 2>/dev/null
+addgroup -S fcron 2>/dev/null
+
 exit 0
diff --git a/testing/gdnsd/gdnsd.pre-install b/testing/gdnsd/gdnsd.pre-install
index 040e7f1..8e8af59 100644
--- a/testing/gdnsd/gdnsd.pre-install
+++ b/testing/gdnsd/gdnsd.pre-install
_at_@ -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/testing/gogs/gogs.pre-install b/testing/gogs/gogs.pre-install
index 1596d65..b1d3258 100644
--- a/testing/gogs/gogs.pre-install
+++ b/testing/gogs/gogs.pre-install
_at_@ -1,4 +1,6 @@
 #!/bin/sh
 
-adduser -S -h /var/lib/gogs -s /bin/ash -G www-data -D -g gogs gogs 2>/dev/null || true
-passwd -u gogs || true
+adduser -S -h /var/lib/gogs -s /bin/ash -G www-data -D -g gogs gogs 2>/dev/null
+passwd -u gogs 2>/dev/null
+
+exit 0
diff --git a/testing/lightdm/lightdm.pre-install b/testing/lightdm/lightdm.pre-install
index b8dbf56..b7efe57 100644
--- a/testing/lightdm/lightdm.pre-install
+++ b/testing/lightdm/lightdm.pre-install
_at_@ -1,6 +1,8 @@
 #!/bin/sh
 
 name=lightdm
+
 addgroup -S $name 2>/dev/null
 adduser -S -H -h /var/run/lightdm -s /bin/false -D -G $name -g $name $name 2>/dev/null
+
 exit 0
diff --git a/testing/lizardfs/lizardfs.pre-install b/testing/lizardfs/lizardfs.pre-install
index f302e85..e4b14a6 100644
--- a/testing/lizardfs/lizardfs.pre-install
+++ b/testing/lizardfs/lizardfs.pre-install
_at_@ -3,4 +3,5 @@
 addgroup -S mfs 2>/dev/null
 adduser -S -H -h /var/lib/mfs -s /sbin/nologin -D -G mfs -g mfs mfs \
 	2>/dev/null
+
 exit 0
diff --git a/testing/lshell/lshell.pre-install b/testing/lshell/lshell.pre-install
index 89e31b2..8aedffa 100644
--- a/testing/lshell/lshell.pre-install
+++ b/testing/lshell/lshell.pre-install
_at_@ -1,4 +1,6 @@
 #!/bin/sh
+
 addgroup -S lshell 2>/dev/null
 adduser -S -H -h /var/empty -G lshell -D -s /sbin/nologin -g lshell lshell 2>/dev/null
+
 exit 0
diff --git a/testing/lusca/lusca.pre-install b/testing/lusca/lusca.pre-install
index 72953cf..f70964f 100644
--- a/testing/lusca/lusca.pre-install
+++ b/testing/lusca/lusca.pre-install
_at_@ -1,6 +1,7 @@
 #!/bin/sh
 
-adduser -S -D -g lusca lusca -h /var/cache/lusca -s /sbin/nologin  2>/dev/null
+adduser -S -D -g lusca lusca -h /var/cache/lusca -s /sbin/nologin 2>/dev/null
 addgroup -S winbind 2>/dev/null
-addgroup lusca winbind
+addgroup lusca winbind 2>/dev/null
+
 exit 0
diff --git a/testing/lusca/lusca.pre-upgrade b/testing/lusca/lusca.pre-upgrade
index 72953cf..f70964f 100644
--- a/testing/lusca/lusca.pre-upgrade
+++ b/testing/lusca/lusca.pre-upgrade
_at_@ -1,6 +1,7 @@
 #!/bin/sh
 
-adduser -S -D -g lusca lusca -h /var/cache/lusca -s /sbin/nologin  2>/dev/null
+adduser -S -D -g lusca lusca -h /var/cache/lusca -s /sbin/nologin 2>/dev/null
 addgroup -S winbind 2>/dev/null
-addgroup lusca winbind
+addgroup lusca winbind 2>/dev/null
+
 exit 0
diff --git a/testing/milter-greylist/milter-greylist.pre-install b/testing/milter-greylist/milter-greylist.pre-install
index f5e5359..c104db9 100644
--- a/testing/milter-greylist/milter-greylist.pre-install
+++ b/testing/milter-greylist/milter-greylist.pre-install
_at_@ -1,4 +1,6 @@
 #!/bin/sh
-addgroup -S smmsp &>/dev/null
-adduser -h /var/lib/milter-greylist -s /sbin/nologin -S -G smmsp -g smmsp smmsp &>/dev/null
+
+addgroup -S smmsp 2>/dev/null
+adduser -h /var/lib/milter-greylist -s /sbin/nologin -S -G smmsp -g smmsp smmsp 2>/dev/null
+
 exit 0
diff --git a/testing/mlocate/mlocate.pre-install b/testing/mlocate/mlocate.pre-install
index 18aa121..8ae6bbd 100644
--- a/testing/mlocate/mlocate.pre-install
+++ b/testing/mlocate/mlocate.pre-install
_at_@ -1,3 +1,5 @@
 #!/bin/sh
+
 addgroup -S locate 2>/dev/null
+
 exit 0
diff --git a/testing/mongodb/mongodb.pre-install b/testing/mongodb/mongodb.pre-install
index 93c85ec..12b09a1 100644
--- a/testing/mongodb/mongodb.pre-install
+++ b/testing/mongodb/mongodb.pre-install
_at_@ -1,5 +1,6 @@
 #!/bin/sh
 
-addgroup -S mongodb
-adduser -S -D -G mongodb -h /var/lib/mongodb -s /sbin/nologin -g mongodb mongodb
+addgroup -S mongodb 2>/dev/null
+adduser -S -D -G mongodb -h /var/lib/mongodb -s /sbin/nologin -g mongodb mongodb 2>/dev/null
+
 exit 0
diff --git a/testing/motion/motion.pre-install b/testing/motion/motion.pre-install
index 7e66ab0..91a4c34 100644
--- a/testing/motion/motion.pre-install
+++ b/testing/motion/motion.pre-install
_at_@ -1,6 +1,7 @@
 #!/bin/sh
+
 addgroup -S motion 2>/dev/null
 adduser -S -h /home/motion -s /bin/false -G motion -D -g motion motion 2>/dev/null
-addgroup motion video
-exit 0
+addgroup motion video 2>/dev/null
 
+exit 0
diff --git a/testing/namecoin/namecoin.pre-install b/testing/namecoin/namecoin.pre-install
index 33c72d1..530d027 100644
--- a/testing/namecoin/namecoin.pre-install
+++ b/testing/namecoin/namecoin.pre-install
_at_@ -1,5 +1,6 @@
 #!/bin/sh
+
 addgroup -S namecoin 2>/dev/null
 adduser -S -h /var/lib/namecoin -g namecoin -G namecoin -D -s /sbin/nologin namecoin 2>/dev/null
-exit 0
 
+exit 0
diff --git a/testing/ntopng/ntopng.pre-install b/testing/ntopng/ntopng.pre-install
index 2386dc8..9af92bb 100755
--- a/testing/ntopng/ntopng.pre-install
+++ b/testing/ntopng/ntopng.pre-install
_at_@ -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/testing/nut/nut.pre-install b/testing/nut/nut.pre-install
index cea4d7f..707f98d 100644
--- a/testing/nut/nut.pre-install
+++ b/testing/nut/nut.pre-install
_at_@ -1,4 +1,5 @@
 #!/bin/sh
 
 adduser nut uucp 2>/dev/null
+
 exit 0
diff --git a/testing/opennebula/opennebula-node-kvm.pre-install b/testing/opennebula/opennebula-node-kvm.pre-install
index 5cf97ee..73173a7 100644
--- a/testing/opennebula/opennebula-node-kvm.pre-install
+++ b/testing/opennebula/opennebula-node-kvm.pre-install
_at_@ -8,5 +8,6 @@ adduser -S -D -s /bin/ash \
 addgroup oneadmin libvirt 2>/dev/null
 addgroup oneadmin readproc 2>/dev/null
 addgroup oneadmin kvm 2>/dev/null
-passwd -u oneadmin &>/dev/null
+passwd -u oneadmin 2>/dev/null
+
 exit 0
diff --git a/testing/opennebula/opennebula.pre-install b/testing/opennebula/opennebula.pre-install
index e59e414..15527eb 100644
--- a/testing/opennebula/opennebula.pre-install
+++ b/testing/opennebula/opennebula.pre-install
_at_@ -4,5 +4,6 @@ addgroup -S oneadmin 2>/dev/null
 adduser -S -D -s /bin/ash \
 	-H -h /var/lib/one -G oneadmin \
 	-g "OpenNebula user" oneadmin 2>/dev/null
-passwd -u oneadmin &>/dev/null
+passwd -u oneadmin 2>/dev/null
+
 exit 0
diff --git a/testing/opensips/opensips.pre-install b/testing/opensips/opensips.pre-install
index 9ef4702..8d07749 100644
--- a/testing/opensips/opensips.pre-install
+++ b/testing/opensips/opensips.pre-install
_at_@ -1,5 +1,5 @@
 #!/bin/sh
 
-adduser -S -H -h /var/empty -s /bin/false -D -g opensips opensips  2>/dev/null
+adduser -S -H -h /var/empty -s /bin/false -D -g opensips opensips 2>/dev/null
 
 exit 0
diff --git a/testing/openxcap/openxcap.pre-install b/testing/openxcap/openxcap.pre-install
index 44ad106..7c90e27 100755
--- a/testing/openxcap/openxcap.pre-install
+++ b/testing/openxcap/openxcap.pre-install
_at_@ -2,4 +2,5 @@
 
 addgroup -S openxcap 2>/dev/null
 adduser -S -G openxcap -h /var/run/openxcap -s /bin/false -D -H -g openxcap openxcap 2>/dev/null
+
 exit 0
diff --git a/testing/pdns/pdns.pre-install b/testing/pdns/pdns.pre-install
index e0b3c5a..bf00793 100644
--- a/testing/pdns/pdns.pre-install
+++ b/testing/pdns/pdns.pre-install
_at_@ -1,4 +1,5 @@
 #!/bin/sh
 
 adduser -S -H -h /var/empty -D -s /bin/false -g pdns pdns 2>/dev/null
+
 exit 0
diff --git a/testing/prosody/prosody.pre-install b/testing/prosody/prosody.pre-install
index e2fab21..c15127d 100644
--- a/testing/prosody/prosody.pre-install
+++ b/testing/prosody/prosody.pre-install
_at_@ -1,4 +1,5 @@
 #!/bin/sh
+
 addgroup -S prosody 2>/dev/null
 adduser -S -D \
 	-h /var/lib/prosody \
_at_@ -6,4 +7,5 @@ adduser -S -D \
 	-g "Prosody XMPP Server" \
     -G prosody \
 	prosody 2>/dev/null
+
 exit 0
diff --git a/testing/qpage/qpage.pre-install b/testing/qpage/qpage.pre-install
index aaa8d3e..5e7eed0 100644
--- a/testing/qpage/qpage.pre-install
+++ b/testing/qpage/qpage.pre-install
_at_@ -1,3 +1,5 @@
 #!/bin/sh
 
-adduser -S -h /var/lib/qpage -s /bin/false -G qpage -D -g qpage qpage 2>/dev/null || true
+adduser -S -h /var/lib/qpage -s /bin/false -G qpage -D -g qpage qpage 2>/dev/null
+
+exit 0
diff --git a/testing/quicktun/quicktun.pre-install b/testing/quicktun/quicktun.pre-install
index c17d220..b3c4c50 100755
--- a/testing/quicktun/quicktun.pre-install
+++ b/testing/quicktun/quicktun.pre-install
_at_@ -1,5 +1,6 @@
 #!/bin/sh
-addgroup -S quicktun
-adduser -S -h /var/run/quicktun -s /sbin/nologin -G quicktun -g "quicktun user" -H -D quicktun
-exit 0
 
+addgroup -S quicktun 2>/dev/null
+adduser -S -h /var/run/quicktun -s /sbin/nologin -G quicktun -g "quicktun user" -H -D quicktun 2>/dev/null
+
+exit 0
diff --git a/testing/radicale/radicale.pre-install b/testing/radicale/radicale.pre-install
index f101c38..c15cf63 100644
--- a/testing/radicale/radicale.pre-install
+++ b/testing/radicale/radicale.pre-install
_at_@ -1,7 +1,9 @@
 #!/bin/sh
 
 name=radicale
+
 addgroup -S $name 2>/dev/null
 adduser -S -H -h /var/lib/$name -s /sbin/nologin -D -G $name -g $name $name 2>/dev/null
 addgroup $name $name 2>/dev/null
+
 exit 0
diff --git a/testing/rancid/rancid.pre-install b/testing/rancid/rancid.pre-install
index 7204ea3..51e0dc8 100644
--- a/testing/rancid/rancid.pre-install
+++ b/testing/rancid/rancid.pre-install
_at_@ -2,4 +2,5 @@
 
 addgroup -S netadm 2>/dev/null
 adduser -S -h /var/rancid -s /bin/sh -G netadm -D -g rancid rancid 2>/dev/null
+
 exit 0
diff --git a/testing/rrdbot/rrdbot.pre-install b/testing/rrdbot/rrdbot.pre-install
index 291f918..7004829 100644
--- a/testing/rrdbot/rrdbot.pre-install
+++ b/testing/rrdbot/rrdbot.pre-install
_at_@ -2,6 +2,6 @@
 
 # this user should be included in alpine-baselayout-1.2.
 # included here for backward compability.
-adduser -S -H -s /bin/false -D -g rrdbotd rrdbotd  2>/dev/null
+adduser -S -H -s /bin/false -D -g rrdbotd rrdbotd 2>/dev/null
 
 exit 0
diff --git a/testing/rutorrent/rutorrent.pre-install b/testing/rutorrent/rutorrent.pre-install
index 0d81455..2c539f6 100644
--- a/testing/rutorrent/rutorrent.pre-install
+++ b/testing/rutorrent/rutorrent.pre-install
_at_@ -1,4 +1,5 @@
 #!/bin/sh
+
 addgroup -S rutorrent 2>/dev/null
-exit 0
 
+exit 0
diff --git a/testing/sipwise-sems/sipwise-sems.pre-install b/testing/sipwise-sems/sipwise-sems.pre-install
index b3b5c78..83d4f74 100644
--- a/testing/sipwise-sems/sipwise-sems.pre-install
+++ b/testing/sipwise-sems/sipwise-sems.pre-install
_at_@ -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/testing/socklog/socklog.post-install b/testing/socklog/socklog.post-install
index 3f1b8a3..a663d3d 100644
--- a/testing/socklog/socklog.post-install
+++ b/testing/socklog/socklog.post-install
_at_@ -19,3 +19,4 @@ exec chpst -Unobody socklog unix /dev/log
 EOF
 fi
 
+exit 0
diff --git a/testing/stunnel/stunnel.pre-install b/testing/stunnel/stunnel.pre-install
index cfb5805..22e6f41 100644
--- a/testing/stunnel/stunnel.pre-install
+++ b/testing/stunnel/stunnel.pre-install
_at_@ -2,4 +2,5 @@
 
 addgroup -S stunnel 2>/dev/null
 adduser -S -H -h /dev/null -s /sbin/nologin -D -G stunnel -g stunnel stunnel 2>/dev/null
+
 exit 0
diff --git a/testing/thttpd/thttpd.pre-install b/testing/thttpd/thttpd.pre-install
index c2ccfb7..12e8607 100644
--- a/testing/thttpd/thttpd.pre-install
+++ b/testing/thttpd/thttpd.pre-install
_at_@ -4,3 +4,5 @@ addgroup -S -g 82 www-data 2>/dev/null
 adduser -S -H -h /var/www/localhost/htdocs -s /sbin/nologin \
         -D -g thttpd thttpd 2>/dev/null
 addgroup thttpd www-data 2>/dev/null
+
+exit 0
diff --git a/testing/tor/tor.pre-install b/testing/tor/tor.pre-install
index 2353635..5796d11 100644
--- a/testing/tor/tor.pre-install
+++ b/testing/tor/tor.pre-install
_at_@ -1,4 +1,5 @@
 #!/bin/sh
+
 adduser -S -h /var/run/tor -s /sbin/nologin -D -g tor tor 2>/dev/null
-exit 0
 
+exit 0
diff --git a/testing/tvheadend-git/tvheadend-git.pre-install b/testing/tvheadend-git/tvheadend-git.pre-install
index 84ca2f8..3999c33 100644
--- a/testing/tvheadend-git/tvheadend-git.pre-install
+++ b/testing/tvheadend-git/tvheadend-git.pre-install
_at_@ -1,4 +1,6 @@
 #!/bin/sh
+
 adduser -S -s /sbin/nologin -H -h /usr/share/tvheadend -g tvheadend tvheadend 2>/dev/null
 adduser tvheadend video
+
 exit 0
diff --git a/testing/udevil/udevil.pre-install b/testing/udevil/udevil.pre-install
index bd4b7de..9d4b1c3 100644
--- a/testing/udevil/udevil.pre-install
+++ b/testing/udevil/udevil.pre-install
_at_@ -1,4 +1,5 @@
 #!/bin/sh
+
 addgroup -S plugdev 2>/dev/null
-exit 0
 
+exit 0
diff --git a/testing/vault/vault.pre-install b/testing/vault/vault.pre-install
index 60d449f..3df21bb 100644
--- a/testing/vault/vault.pre-install
+++ b/testing/vault/vault.pre-install
_at_@ -2,4 +2,5 @@
 
 addgroup -S vault 2>/dev/null
 adduser -S -H -h /dev/null -s /sbin/nologin -D -G vault -g vault vault 2>/dev/null
+
 exit 0
diff --git a/testing/vnstat/vnstat.pre-install b/testing/vnstat/vnstat.pre-install
index 9445d10..e253007 100644
--- a/testing/vnstat/vnstat.pre-install
+++ b/testing/vnstat/vnstat.pre-install
_at_@ -2,4 +2,5 @@
 
 addgroup -S vnstat 2>/dev/null
 adduser -S -h /var/lib/ -H -s /bin/false -D -G vnstat -g vnstat vnstat 2>/dev/null
+
 exit 0
diff --git a/testing/wt/wt.pre-install b/testing/wt/wt.pre-install
index 849322d..07311bd 100644
--- a/testing/wt/wt.pre-install
+++ b/testing/wt/wt.pre-install
_at_@ -1,5 +1,7 @@
 #!/bin/sh
+
 addgroup -S -g 82 www-data 2>/dev/null
 adduser -S -H -s /sbin/nologin -D -g wt wt 2>/dev/null
 addgroup wt www-data 2>/dev/null
+
 exit 0
diff --git a/testing/x2goserver/x2goserver.pre-install b/testing/x2goserver/x2goserver.pre-install
index 911390e..6a20a96 100755
--- a/testing/x2goserver/x2goserver.pre-install
+++ b/testing/x2goserver/x2goserver.pre-install
_at_@ -1,4 +1,6 @@
 #!/bin/sh
 
-addgroup -S x2gouser
-adduser -S -D -G x2gouser -h /var/lib/x2go -s /bin/false -g x2gouser x2gouser
+addgroup -S x2gouser 2>/dev/null
+adduser -S -D -G x2gouser -h /var/lib/x2go -s /bin/false -g x2gouser x2gouser 2>/dev/null
+
+exit 0
diff --git a/testing/zabbix/zabbix-agent.pre-install b/testing/zabbix/zabbix-agent.pre-install
index 3ec8ae7..2464f27 100644
--- a/testing/zabbix/zabbix-agent.pre-install
+++ b/testing/zabbix/zabbix-agent.pre-install
_at_@ -3,4 +3,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 -S -g 30 zabbix 2>/dev/null
+
 exit 0
diff --git a/testing/zabbix/zabbix.pre-install b/testing/zabbix/zabbix.pre-install
index 30851f1..7cc5be2 100644
--- a/testing/zabbix/zabbix.pre-install
+++ b/testing/zabbix/zabbix.pre-install
_at_@ -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/unmaintained/apache-couchdb/apache-couchdb.post-install b/unmaintained/apache-couchdb/apache-couchdb.post-install
index 4bf99a4..ae1da50 100755
--- a/unmaintained/apache-couchdb/apache-couchdb.post-install
+++ b/unmaintained/apache-couchdb/apache-couchdb.post-install
_at_@ -1,4 +1,6 @@
 #!/bin/sh
-addgroup -S couchdb &>/dev/null
-adduser -S -h /var/run/couchdb -s /bin/false -G couchdb -D -g couchdb couchdb &>/dev/null
+
+addgroup -S couchdb 2>/dev/null
+adduser -S -h /var/run/couchdb -s /bin/false -G couchdb -D -g couchdb couchdb 2>/dev/null
+
 exit 0
diff --git a/unmaintained/ejabberd-git/ejabberd-git.pre-install b/unmaintained/ejabberd-git/ejabberd-git.pre-install
index d4cab3c..efda04b 100644
--- a/unmaintained/ejabberd-git/ejabberd-git.pre-install
+++ b/unmaintained/ejabberd-git/ejabberd-git.pre-install
_at_@ -1,3 +1,5 @@
 #!/bin/sh
-adduser -S -H -h /var/lib/ejabberd -G ejabberd -D -g ejabberd ejabberd  2>/dev/null
+
+adduser -S -H -h /var/lib/ejabberd -G ejabberd -D -g ejabberd ejabberd 2>/dev/null
+
 exit 0
diff --git a/unmaintained/kde-workspace/kde-workspace.pre-install b/unmaintained/kde-workspace/kde-workspace.pre-install
index ef2e671..b55298b 100644
--- a/unmaintained/kde-workspace/kde-workspace.pre-install
+++ b/unmaintained/kde-workspace/kde-workspace.pre-install
_at_@ -1,6 +1,8 @@
 #!/bin/sh
 
 name=kdm
+
 addgroup -S $name 2>/dev/null
 adduser -S -H -h /var/run/kdm -s /bin/false -D -G $name -g $name $name 2>/dev/null
+
 exit 0
diff --git a/unmaintained/shadowircd/shadowircd.pre-install b/unmaintained/shadowircd/shadowircd.pre-install
index e05b5e5..58b2a85 100644
--- a/unmaintained/shadowircd/shadowircd.pre-install
+++ b/unmaintained/shadowircd/shadowircd.pre-install
_at_@ -1,3 +1,5 @@
 #!/bin/sh
+
 adduser -S -h /var/run/shadowircd -s /bin/false -D -g ircd ircd 2>/dev/null
+
 exit 0
-- 
2.6.6
---
Unsubscribe:  alpine-aports+unsubscribe_at_lists.alpinelinux.org
Help:         alpine-aports+help_at_lists.alpinelinux.org
---
Received on Sat Apr 23 2016 - 13:13:39 GMT