Reorder options passed to addgroup in scripts: make -S first.

It's only for consistency and to ease spotting lack of it.

14 files changed, 14 insertions, 14 deletions

diff --git a/community/redmine/redmine.pre-install b/community/redmine/redmine.pre-install
index 780b89f54b8..f3828449b66 100644
--- a/community/redmine/redmine.pre-install
+++ b/community/redmine/redmine.pre-install
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-addgroup -g 82 -S www-data 2>/dev/null
+addgroup -S -g 82 www-data 2>/dev/null
 adduser -S -H -h /usr/share/webapps/redmine -s /bin/sh -D redmine 2>/dev/null
 addgroup redmine www-data 2>/dev/null
 
diff --git a/main/apache2/apache2.pre-install b/main/apache2/apache2.pre-install
index 7b938993344..762de839105 100644
--- a/main/apache2/apache2.pre-install
+++ b/main/apache2/apache2.pre-install
@@ -1,5 +1,5 @@
 #!/bin/sh
-addgroup -g 82 -S www-data 2>/dev/null
+addgroup -S -g 82 www-data 2>/dev/null
 adduser -H -h /var/www -s /sbin/nologin -D 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 d5005d23018..dbc1d68e438 100644
--- a/main/apache2/apache2.pre-upgrade
+++ b/main/apache2/apache2.pre-upgrade
@@ -1,5 +1,5 @@
 #!/bin/sh
 
-addgroup -g 82 -S www-data 2>/dev/null
+addgroup -S -g 82 www-data 2>/dev/null
 addgroup apache www-data 2>/dev/null
 exit 0
diff --git a/main/darkhttpd/darkhttpd.pre-install b/main/darkhttpd/darkhttpd.pre-install
index 2ba71fbbe51..80cfa6b94bd 100644
--- a/main/darkhttpd/darkhttpd.pre-install
+++ b/main/darkhttpd/darkhttpd.pre-install
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-addgroup -g 82 -S www-data 2>/dev/null
+addgroup -S -g 82 www-data 2>/dev/null
 adduser -S -H -h /var/www/localhost/htdocs -s /sbin/nologin -D darkhttpd \
 	2>/dev/null
 addgroup darkhttpd www-data 2>/dev/null
diff --git a/main/lighttpd/lighttpd.pre-install b/main/lighttpd/lighttpd.pre-install
index 578814db980..95202928f95 100644
--- a/main/lighttpd/lighttpd.pre-install
+++ b/main/lighttpd/lighttpd.pre-install
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-addgroup -g 82 -S www-data 2>/dev/null
+addgroup -S -g 82 www-data 2>/dev/null
 adduser -H -h /var/www/localhost/htdocs -s /sbin/nologin -D lighttpd 2>/dev/null
 addgroup lighttpd www-data 2>/dev/null
 
diff --git a/main/mini_httpd/mini_httpd.pre-install b/main/mini_httpd/mini_httpd.pre-install
index d84f0b7718b..3b5258af4b5 100644
--- a/main/mini_httpd/mini_httpd.pre-install
+++ b/main/mini_httpd/mini_httpd.pre-install
@@ -7,7 +7,7 @@ if [ -f /etc/mini_httpd.conf ] && ! [ -L /etc/mini_httpd.conf ]; then
 		&& ln -s mini_httpd/mini_httpd.conf /etc/mini_httpd.conf
 fi
 
-addgroup -g 82 -S www-data 2>/dev/null
+addgroup -S -g 82 www-data 2>/dev/null
 adduser -S -H -h /var/www/localhost/htdocs -s /sbin/nologin \
         -D minihttpd 2>/dev/null
 addgroup minihttpd www-data 2>/dev/null
diff --git a/main/nginx-initscripts/nginx-initscripts.pre-install b/main/nginx-initscripts/nginx-initscripts.pre-install
index 55b5bfcda54..63db1e99ce8 100644
--- a/main/nginx-initscripts/nginx-initscripts.pre-install
+++ b/main/nginx-initscripts/nginx-initscripts.pre-install
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-addgroup -g 82 -S www-data 2>/dev/null
+addgroup -S -g 82 www-data 2>/dev/null
 addgroup -S nginx 2>/dev/null
 adduser -S -G nginx -H -h /var/www/localhost/htdocs -s /sbin/nologin \
 	-D nginx 2>/dev/null
diff --git a/main/qemu/qemu.pre-install b/main/qemu/qemu.pre-install
index ffee1f8708a..d6449414cf9 100644
--- a/main/qemu/qemu.pre-install
+++ b/main/qemu/qemu.pre-install
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-getent group kvm >/dev/null || addgroup -g 34 -S kvm
+getent group kvm >/dev/null || addgroup -S -g 34 kvm
diff --git a/testing/h2o/h2o.pre-install b/testing/h2o/h2o.pre-install
index 7fc8104e181..12a76a026bd 100644
--- a/testing/h2o/h2o.pre-install
+++ b/testing/h2o/h2o.pre-install
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 adduser -s /sbin/nologin -h /var/www -D -S -H h2o 2>/dev/null 
-addgroup -g 82 -S www-data 2>/dev/null
+addgroup -S -g 82 www-data 2>/dev/null
 addgroup h2o www-data 2>/dev/null
 
 exit 0
diff --git a/testing/nginx-naxsi/nginx-naxsi.pre-install b/testing/nginx-naxsi/nginx-naxsi.pre-install
index 55b5bfcda54..63db1e99ce8 100644
--- a/testing/nginx-naxsi/nginx-naxsi.pre-install
+++ b/testing/nginx-naxsi/nginx-naxsi.pre-install
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-addgroup -g 82 -S www-data 2>/dev/null
+addgroup -S -g 82 www-data 2>/dev/null
 addgroup -S nginx 2>/dev/null
 adduser -S -G nginx -H -h /var/www/localhost/htdocs -s /sbin/nologin \
 	-D nginx 2>/dev/null
diff --git a/testing/tengine/tengine.pre-install b/testing/tengine/tengine.pre-install
index 5d0abf7849c..5e3285530d1 100644
--- a/testing/tengine/tengine.pre-install
+++ b/testing/tengine/tengine.pre-install
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-addgroup -g 82 -S www-data 2>/dev/null
+addgroup -S -g 82 www-data 2>/dev/null
 addgroup -S tengine 2>/dev/null
 adduser -S -G tengine -H -h /var/www/localhost/htdocs -s /sbin/nologin \
 	-D tengine 2>/dev/null
diff --git a/testing/tengine/tengine.pre-upgrade b/testing/tengine/tengine.pre-upgrade
index 5d0abf7849c..5e3285530d1 100644
--- a/testing/tengine/tengine.pre-upgrade
+++ b/testing/tengine/tengine.pre-upgrade
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-addgroup -g 82 -S www-data 2>/dev/null
+addgroup -S -g 82 www-data 2>/dev/null
 addgroup -S tengine 2>/dev/null
 adduser -S -G tengine -H -h /var/www/localhost/htdocs -s /sbin/nologin \
 	-D tengine 2>/dev/null
diff --git a/testing/thttpd/thttpd.pre-install b/testing/thttpd/thttpd.pre-install
index f74083866b6..104f72bc862 100644
--- a/testing/thttpd/thttpd.pre-install
+++ b/testing/thttpd/thttpd.pre-install
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-addgroup -g 82 -S www-data 2>/dev/null
+addgroup -S -g 82 www-data 2>/dev/null
 adduser -S -H -h /var/www/localhost/htdocs -s /sbin/nologin \
         -D thttpd 2>/dev/null
 addgroup thttpd www-data 2>/dev/null
diff --git a/testing/wt/wt.pre-install b/testing/wt/wt.pre-install
index ad7cbed6543..8fca39d2502 100644
--- a/testing/wt/wt.pre-install
+++ b/testing/wt/wt.pre-install
@@ -1,5 +1,5 @@
 #!/bin/sh
-addgroup -g 82 -S www-data 2>/dev/null
+addgroup -S -g 82 www-data 2>/dev/null
 adduser -H -s /sbin/nologin -D wt 2>/dev/null
 addgroup wt www-data 2>/dev/null
 exit 0