Reorder arguments passed to addgroup/adduser in scripts.

Now all invocations have following order of arguments (if present):

    addgroup -S -g ... GROUP
    adduser -S -u ... -D -H -h ... -s ... -G ... -g ... USER

12 files changed, 12 insertions, 12 deletions

diff --git a/community/caddy/caddy.pre-install b/community/caddy/caddy.pre-install
index dc783503886..ccb4f07f8fa 100644
--- a/community/caddy/caddy.pre-install
+++ b/community/caddy/caddy.pre-install
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-adduser -S -h /var/lib/caddy -D -s /sbin/nologin -g caddy caddy 2>/dev/null
+adduser -S -D -h /var/lib/caddy -s /sbin/nologin -g caddy caddy 2>/dev/null
 adduser caddy www-data 2>/dev/null
 
 exit 0
diff --git a/community/docker-registry/docker-registry.pre-install b/community/docker-registry/docker-registry.pre-install
index 5d1fbbbed3b..8c1c98636f6 100644
--- a/community/docker-registry/docker-registry.pre-install
+++ b/community/docker-registry/docker-registry.pre-install
@@ -1,6 +1,6 @@
 #!/bin/sh
 
 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
+adduser -S -D -H -h /dev/null -s /sbin/nologin -G docker-registry -g docker-registry docker-registry 2>/dev/null
 
 exit 0
diff --git a/community/domoticz/domoticz.pre-install b/community/domoticz/domoticz.pre-install
index 5162f883856..227206764fb 100644
--- a/community/domoticz/domoticz.pre-install
+++ b/community/domoticz/domoticz.pre-install
@@ -1,5 +1,5 @@
 #!/bin/sh
 
-adduser -S -h /var/lib/domoticz -D -s /sbin/nologin -g domoticz domoticz 2>/dev/null
+adduser -S -D -h /var/lib/domoticz -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 7b0002ce346..ccb5265c7f1 100644
--- a/community/icinga2/icinga2.pre-install
+++ b/community/icinga2/icinga2.pre-install
@@ -2,7 +2,7 @@
 
 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 -S -D -H -h /var/spool/icinga2 -s /sbin/nologin -G icinga -g icinga icinga 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 da9a0259594..ec187b9ce6e 100644
--- a/community/minetest/minetest-server.pre-install
+++ b/community/minetest/minetest-server.pre-install
@@ -1,5 +1,5 @@
 #!/bin/sh
 
-adduser -S -s /sbin/nologin -D -h /var/lib/minetest -g minetest minetest games 2>/dev/null
+adduser -S -D -h /var/lib/minetest -s /sbin/nologin -G games -g minetest minetest 2>/dev/null
 
 exit 0
diff --git a/community/oscam/oscam.pre-install b/community/oscam/oscam.pre-install
index 4e0c49a166b..a9982c724b4 100644
--- a/community/oscam/oscam.pre-install
+++ b/community/oscam/oscam.pre-install
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-adduser -S -H -D -s /sbin/nologin -g oscam oscam 2>/dev/null
+adduser -S -D -H -s /sbin/nologin -g oscam oscam 2>/dev/null
 addgroup oscam usb 2>/dev/null
 
 exit 0
diff --git a/community/redmine/redmine.pre-install b/community/redmine/redmine.pre-install
index 072bd1d1552..8957913cfc5 100644
--- a/community/redmine/redmine.pre-install
+++ b/community/redmine/redmine.pre-install
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 addgroup -S -g 82 www-data 2>/dev/null
-adduser -S -H -h /usr/share/webapps/redmine -s /bin/sh -D -g redmine redmine 2>/dev/null
+adduser -S -D -H -h /usr/share/webapps/redmine -s /bin/sh -g redmine redmine 2>/dev/null
 addgroup redmine www-data 2>/dev/null
 
 exit 0
diff --git a/community/seafile/seafile-server.pre-install b/community/seafile/seafile-server.pre-install
index b5c1b4f64e1..7e3df0b5ef9 100644
--- a/community/seafile/seafile-server.pre-install
+++ b/community/seafile/seafile-server.pre-install
@@ -3,6 +3,6 @@
 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
+adduser -S -u 800 -D -h $SEAFILE_HOME -s /bin/sh -G seafile -g seafile seafile 2>/dev/null
 
 exit 0
diff --git a/community/smstools/smstools.pre-install b/community/smstools/smstools.pre-install
index 0a5106f6e58..104cf129c16 100755
--- a/community/smstools/smstools.pre-install
+++ b/community/smstools/smstools.pre-install
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 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 -S -D -h /var/spool/sms -s /sbin/nologin -G smsd -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 aa2f7dfca5a..e0e250af6d0 100644
--- a/community/sniproxy/sniproxy.pre-install
+++ b/community/sniproxy/sniproxy.pre-install
@@ -1,6 +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
+adduser -S -D -h /var/log/sniproxy -s /bin/false -g sniproxy sniproxy 2>/dev/null
 
 exit 0
diff --git a/community/syncthing/syncthing.pre-install b/community/syncthing/syncthing.pre-install
index ab337cca31e..a2ee46c8313 100644
--- a/community/syncthing/syncthing.pre-install
+++ b/community/syncthing/syncthing.pre-install
@@ -1,5 +1,5 @@
 #!/bin/sh
 
-adduser -S -H -h /var/lib/syncthing -s /sbin/nologin -D -g syncthing syncthing 2>/dev/null
+adduser -S -D -H -h /var/lib/syncthing -s /sbin/nologin -g syncthing syncthing 2>/dev/null
 
 exit 0
diff --git a/community/tvheadend/tvheadend.pre-install b/community/tvheadend/tvheadend.pre-install
index 6b64423424c..3e270cb7f20 100644
--- a/community/tvheadend/tvheadend.pre-install
+++ b/community/tvheadend/tvheadend.pre-install
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-adduser -S -G video -s /sbin/nologin -H -h /usr/share/tvheadend -g tvheadend tvheadend 2>/dev/null
+adduser -S -H -h /usr/share/tvheadend -s /sbin/nologin -G video -g tvheadend tvheadend 2>/dev/null
 addgroup tvheadend usb 2>/dev/null
 
 exit 0