aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichał Łyszczek <michal.lyszczek@bofc.pl>2019-08-18 17:45:43 +0200
committerMichał Łyszczek <michal.lyszczek@bofc.pl>2019-08-18 17:55:42 +0200
commitcecfa039e20c5f421a30f88dec7dc3f06c9fdacd (patch)
tree59ea5dbc5feb1bf1a80bce9cb878cd13a9e9790c
parent3449f187ee875f5f6c221d3f896dc1c1b6f6a22b (diff)
downloadtermsend-cecfa039e20c5f421a30f88dec7dc3f06c9fdacd.tar.gz
termsend-cecfa039e20c5f421a30f88dec7dc3f06c9fdacd.tar.bz2
termsend-cecfa039e20c5f421a30f88dec7dc3f06c9fdacd.zip
pkg: make sure user is deleted before removing group
no_ci Signed-off-by: Michał Łyszczek <michal.lyszczek@bofc.pl>
-rwxr-xr-xpkg/deb/create-pkg.sh2
-rwxr-xr-xpkg/rpm/create-pkg.sh2
-rwxr-xr-xpkg/tgz/create-pkg.sh2
3 files changed, 3 insertions, 3 deletions
diff --git a/pkg/deb/create-pkg.sh b/pkg/deb/create-pkg.sh
index 4d2c095..d6b0007 100755
--- a/pkg/deb/create-pkg.sh
+++ b/pkg/deb/create-pkg.sh
@@ -14,8 +14,8 @@ atexit()
dpkg -r libembedlog-dev
dpkg -r libembedlog0
# manually remove kurload group and user as package uninstall won't do it
- groupdel kurload
userdel kurload
+ groupdel kurload
rmdir /var/lib/kurload
rm /etc/kurload.conf
diff --git a/pkg/rpm/create-pkg.sh b/pkg/rpm/create-pkg.sh
index 716e5f1..8ae4b3f 100755
--- a/pkg/rpm/create-pkg.sh
+++ b/pkg/rpm/create-pkg.sh
@@ -23,8 +23,8 @@ atexit()
yum remove -y "${project}"
fi
- groupdel kurload
userdel kurload
+ groupdel kurload
rmdir /var/lib/kurload
if [ "x${1}" != "xno-exit" ]
diff --git a/pkg/tgz/create-pkg.sh b/pkg/tgz/create-pkg.sh
index 44d5805..6ec0c0e 100755
--- a/pkg/tgz/create-pkg.sh
+++ b/pkg/tgz/create-pkg.sh
@@ -13,8 +13,8 @@ atexit()
# remove dependencies
removepkg embedlog
# manually remove kurload group and user as package uninstall won't do it
- groupdel kurload
userdel kurload
+ groupdel kurload
rmdir /var/lib/kurload
rm /etc/kurload.conf