From 8d8f9a87e735445f88126e79804baa3272778589 Mon Sep 17 00:00:00 2001 From: Micah Anderson Date: Sun, 12 Mar 2017 19:05:24 +0100 Subject: Fix postinst return codes so we can run with -e --- debian/soledad-server.postinst | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) mode change 100644 => 100755 debian/soledad-server.postinst diff --git a/debian/soledad-server.postinst b/debian/soledad-server.postinst old mode 100644 new mode 100755 index 65160d4b..99296c94 --- 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 -- cgit v1.2.3