From 632d26e398084b40fcea599a2a63c9b5478e600b Mon Sep 17 00:00:00 2001 From: hagen Date: Thu, 17 Dec 2015 05:05:27 +0000 Subject: [PATCH] * update maintainer scripts --- debian/postinst | 10 +++++----- debian/postrm | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/debian/postinst b/debian/postinst index ddb5ef7c..4be6bf3f 100755 --- a/debian/postinst +++ b/debian/postinst @@ -1,4 +1,5 @@ #!/bin/sh +set -e I2PDHOME='/var/lib/i2pd' I2PDUSER='i2pd' @@ -8,18 +9,17 @@ case "$1" in # Older versions of adduser created the home directory. # The version of adduser in Debian unstable does not. # Create user and group as a system user. - getent passwd ${I2PDUSER} > /dev/null 2>&1 - if [ $? -eq 2 ]; then - adduser --system --quiet --group --home $I2PDHOME $I2PDUSER - else + if getent passwd $I2PDUSER > /dev/null 2>&1; then groupadd -f $I2PDUSER || true usermod -s "/bin/false" -e 1 $I2PDUSER > /dev/null || true + else + adduser --system --quiet --group --home $I2PDHOME $I2PDUSER fi touch /var/log/i2pd.log chown -f ${I2PDUSER}:adm /var/log/i2pd.log mkdir -p -m0750 $I2PDHOME - chown -f -R ${I2PDUSER}:${I2PDUSER} ${I2PDHOME} + chown -f -R -P ${I2PDUSER}:${I2PDUSER} ${I2PDHOME} ;; abort-upgrade|abort-remove|abort-deconfigure) echo "Aborting upgrade" diff --git a/debian/postrm b/debian/postrm index 7015e547..a188b52c 100755 --- a/debian/postrm +++ b/debian/postrm @@ -1,9 +1,9 @@ #!/bin/sh - set -e if [ "$1" = "purge" ]; then rm -f /etc/default/i2pd /var/log/i2pd.log + rm -rf /etc/i2pd rm -rf /var/lib/i2pd fi