From a60b9f07dee0ae4e9bbe34d4146661fcb33aa478 Mon Sep 17 00:00:00 2001 From: Przemyslaw Pawelczyk Date: Sat, 23 Apr 2016 13:13:39 +0200 Subject: 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. --- main/alpine-baselayout/alpine-baselayout.pre-upgrade | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'main/alpine-baselayout/alpine-baselayout.pre-upgrade') diff --git a/main/alpine-baselayout/alpine-baselayout.pre-upgrade b/main/alpine-baselayout/alpine-baselayout.pre-upgrade index 8a7098f7d1..f7c8db83c4 100644 --- a/main/alpine-baselayout/alpine-baselayout.pre-upgrade +++ b/main/alpine-baselayout/alpine-baselayout.pre-upgrade @@ -14,6 +14,6 @@ for i in /etc/modprobe.d/*; do mv "$i" "$i".conf done -if [ -e /etc/group ] && ! grep -q '^shadow:' /etc/group; then - addgroup -S -g 42 shadow -fi +addgroup -S -g 42 shadow 2>/dev/null + +exit 0 -- cgit v1.2.3