diff options
| author | Przemyslaw Pawelczyk <przemoc@zoho.com> | 2016-04-23 13:13:39 +0200 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2016-04-25 06:55:43 +0000 |
| commit | a60b9f07dee0ae4e9bbe34d4146661fcb33aa478 (patch) | |
| tree | f72d97073ee32bd15b5b0a913f108b144778af1c /main/vsftpd | |
| parent | a593d306c92f8bc15a1797c0a2ccfa784edbc4a0 (diff) | |
| download | aports-a60b9f07dee0ae4e9bbe34d4146661fcb33aa478.tar.bz2 aports-a60b9f07dee0ae4e9bbe34d4146661fcb33aa478.tar.xz | |
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/vsftpd')
| -rwxr-xr-x | main/vsftpd/vsftpd.pre-install | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/main/vsftpd/vsftpd.pre-install b/main/vsftpd/vsftpd.pre-install index 0ed59d906a..c6e45f1b71 100755 --- a/main/vsftpd/vsftpd.pre-install +++ b/main/vsftpd/vsftpd.pre-install @@ -1,5 +1,7 @@ #!/bin/sh -addgroup -S ftp &>/dev/null -addgroup vsftp ftp &>/dev/null -adduser -S -h /var/lib/ftp -s /sbin/nologin -G ftp -g vsftp vsftp &>/dev/null + +addgroup -S ftp 2>/dev/null +addgroup vsftp ftp 2>/dev/null +adduser -S -h /var/lib/ftp -s /sbin/nologin -G ftp -g vsftp vsftp 2>/dev/null + exit 0 |