Mail archive
alpine-aports

[alpine-aports] [PATCH 1/7] Reorder options passed to addgroup in scripts: make -S first.

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

It's only for consistency and to ease spotting lack of it.
---
 community/redmine/redmine.pre-install                | 2 +-
 main/apache2/apache2.pre-install                     | 2 +-
 main/apache2/apache2.pre-upgrade                     | 2 +-
 main/darkhttpd/darkhttpd.pre-install                 | 2 +-
 main/lighttpd/lighttpd.pre-install                   | 2 +-
 main/mini_httpd/mini_httpd.pre-install               | 2 +-
 main/nginx-initscripts/nginx-initscripts.pre-install | 2 +-
 main/qemu/qemu.pre-install                           | 2 +-
 testing/h2o/h2o.pre-install                          | 2 +-
 testing/nginx-naxsi/nginx-naxsi.pre-install          | 2 +-
 testing/tengine/tengine.pre-install                  | 2 +-
 testing/tengine/tengine.pre-upgrade                  | 2 +-
 testing/thttpd/thttpd.pre-install                    | 2 +-
 testing/wt/wt.pre-install                            | 2 +-
 14 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/community/redmine/redmine.pre-install b/community/redmine/redmine.pre-install
index 780b89f..f382844 100644
--- a/community/redmine/redmine.pre-install
+++ b/community/redmine/redmine.pre-install
_at_@ -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 7b93899..762de83 100644
--- a/main/apache2/apache2.pre-install
+++ b/main/apache2/apache2.pre-install
_at_@ -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 d5005d2..dbc1d68 100644
--- a/main/apache2/apache2.pre-upgrade
+++ b/main/apache2/apache2.pre-upgrade
_at_@ -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 2ba71fb..80cfa6b 100644
--- a/main/darkhttpd/darkhttpd.pre-install
+++ b/main/darkhttpd/darkhttpd.pre-install
_at_@ -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 578814d..9520292 100644
--- a/main/lighttpd/lighttpd.pre-install
+++ b/main/lighttpd/lighttpd.pre-install
_at_@ -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 d84f0b7..3b5258a 100644
--- a/main/mini_httpd/mini_httpd.pre-install
+++ b/main/mini_httpd/mini_httpd.pre-install
_at_@ -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 55b5bfc..63db1e9 100644
--- a/main/nginx-initscripts/nginx-initscripts.pre-install
+++ b/main/nginx-initscripts/nginx-initscripts.pre-install
_at_@ -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 ffee1f8..d644941 100644
--- a/main/qemu/qemu.pre-install
+++ b/main/qemu/qemu.pre-install
_at_@ -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 7fc8104..12a76a0 100644
--- a/testing/h2o/h2o.pre-install
+++ b/testing/h2o/h2o.pre-install
_at_@ -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 55b5bfc..63db1e9 100644
--- a/testing/nginx-naxsi/nginx-naxsi.pre-install
+++ b/testing/nginx-naxsi/nginx-naxsi.pre-install
_at_@ -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 5d0abf7..5e32855 100644
--- a/testing/tengine/tengine.pre-install
+++ b/testing/tengine/tengine.pre-install
_at_@ -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 5d0abf7..5e32855 100644
--- a/testing/tengine/tengine.pre-upgrade
+++ b/testing/tengine/tengine.pre-upgrade
_at_@ -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 f740838..104f72b 100644
--- a/testing/thttpd/thttpd.pre-install
+++ b/testing/thttpd/thttpd.pre-install
_at_@ -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 ad7cbed..8fca39d 100644
--- a/testing/wt/wt.pre-install
+++ b/testing/wt/wt.pre-install
_at_@ -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
-- 
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:35 GMT