14 files changed, 32 insertions, 11 deletions
diff --git a/community/caddy/caddy.pre-install b/community/caddy/caddy.pre-install
index 7bf003d657..dc78350388 100644
--- a/community/caddy/caddy.pre-install
+++ b/community/caddy/caddy.pre-install
@@ -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 062477c7fd..2accd54232 100755
--- a/community/davfs2/davfs2.pre-install
+++ b/community/davfs2/davfs2.pre-install
@@ -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 3bc3eabc98..5d1fbbbed3 100644
--- a/community/docker-registry/docker-registry.pre-install
+++ b/community/docker-registry/docker-registry.pre-install
@@ -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 8a1dec6f2a..8cd2d63f34 100644
--- a/community/docker/docker.pre-install
+++ b/community/docker/docker.pre-install
@@ -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 077e0faf80..5162f88385 100644
--- a/community/domoticz/domoticz.pre-install
+++ b/community/domoticz/domoticz.pre-install
@@ -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 e84e09e0c6..7b0002ce34 100644
--- a/community/icinga2/icinga2.pre-install
+++ b/community/icinga2/icinga2.pre-install
@@ -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 4cde63921e..da9a025959 100644
--- a/community/minetest/minetest-server.pre-install
+++ b/community/minetest/minetest-server.pre-install
@@ -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 2f5f5d9d4d..4e0c49a166 100644
--- a/community/oscam/oscam.pre-install
+++ b/community/oscam/oscam.pre-install
@@ -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 66e7a2ccff..b5c1b4f64e 100644
--- a/community/seafile/seafile-server.pre-install
+++ b/community/seafile/seafile-server.pre-install
@@ -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 d9e1d36963..0a5106f6e5 100755
--- a/community/smstools/smstools.pre-install
+++ b/community/smstools/smstools.pre-install
@@ -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 c56f31de53..aa2f7dfca5 100644
--- a/community/sniproxy/sniproxy.pre-install
+++ b/community/sniproxy/sniproxy.pre-install
@@ -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 d8abdb59bf..2ebce6d564 100755
--- a/community/sword/sword.pre-install
+++ b/community/sword/sword.pre-install
@@ -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 002a54f3de..ab337cca31 100644
--- a/community/syncthing/syncthing.pre-install
+++ b/community/syncthing/syncthing.pre-install
@@ -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 6fee0b4e05..6b64423424 100644
--- a/community/tvheadend/tvheadend.pre-install
+++ b/community/tvheadend/tvheadend.pre-install
@@ -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