aboutsummaryrefslogtreecommitdiffstats
path: root/main/squid
diff options
context:
space:
mode:
authorPrzemyslaw Pawelczyk <przemoc@zoho.com>2016-04-23 13:13:39 +0200
committerNatanael Copa <ncopa@alpinelinux.org>2016-04-25 06:55:43 +0000
commita60b9f07dee0ae4e9bbe34d4146661fcb33aa478 (patch)
treef72d97073ee32bd15b5b0a913f108b144778af1c /main/squid
parenta593d306c92f8bc15a1797c0a2ccfa784edbc4a0 (diff)
Improve consistency of scripts using adduser/addgroup.
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.
Diffstat (limited to 'main/squid')
-rw-r--r--main/squid/squid.pre-install5
-rw-r--r--main/squid/squid.pre-upgrade5
2 files changed, 6 insertions, 4 deletions
diff --git a/main/squid/squid.pre-install b/main/squid/squid.pre-install
index 3ac1f9fa161..11ff2bc3d95 100644
--- a/main/squid/squid.pre-install
+++ b/main/squid/squid.pre-install
@@ -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 3ac1f9fa161..11ff2bc3d95 100644
--- a/main/squid/squid.pre-upgrade
+++ b/main/squid/squid.pre-upgrade
@@ -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