diff options
| author | Micah Anderson <micah@riseup.net> | 2017-03-12 19:05:24 +0100 |
|---|---|---|
| committer | varac <varacanero@zeromail.org> | 2017-03-21 12:24:13 +0100 |
| commit | 8d8f9a87e735445f88126e79804baa3272778589 (patch) | |
| tree | bb515b52d067e3562345e1e652e6ad5f2e47e913 | |
| parent | acdfdb4561317628f32b43542e9200f352a20611 (diff) | |
Fix postinst return codes so we can run with -e
| -rwxr-xr-x[-rw-r--r--] | debian/soledad-server.postinst | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/debian/soledad-server.postinst b/debian/soledad-server.postinst index 65160d4b..99296c94 100644..100755 --- a/debian/soledad-server.postinst +++ b/debian/soledad-server.postinst @@ -5,18 +5,14 @@ set -e export PATH=/bin:/usr/bin:/sbin:/usr/sbin # create soledad group -getent group soledad > /dev/null -RET=$? - -if [ ! $RET -eq 0 ]; then +if ! getent group soledad > /dev/null +then addgroup --system soledad fi # create soledad user -id soledad > /dev/null 2>&1 -RET=$? - -if [ ! $RET -eq 0 ]; then +if ! getent passwd soledad > /dev/null +then adduser --system soledad --no-create-home --home /srv/leap/ --ingroup soledad fi @@ -24,10 +20,8 @@ fi usermod -aG ssl-cert soledad # create soledad-admin user -id soledad-admin > /dev/null 2>&1 -RET=$? - -if [ ! $RET -eq 0 ]; then +if ! getent passwd soledad-admin > /dev/null +then adduser --system soledad-admin --no-create-home --home /srv/leap/ --ingroup soledad fi |