uninstaller: improve removing `netdata` from groups (#16742)
Ilya Mashchenko committed
Jan 10, 2024 at 15:40 UTC
92b505d6f0c160cd9d7959340fcb09686cb3bc9d
1 file changed
+13
-7
packaging/installer/netdata-uninstaller.sh
+13
-7
@@ -520,6 +520,15 @@ portable_del_user_from_group() {
520
groupname="${1}"
521
username="${2}"
522
523
+ if command -v getent > /dev/null 2>&1; then
524
+ getent group "${1:-""}" | grep -q "${2}"
525
+ else
526
+ grep "^${1}:" /etc/group | grep -q "${2}"
527
+ fi
528
+
529
+ ret=$?
530
+ [ "${ret}" != "0" ] && return 0
531
+
532
# username is not in group
533
info "Deleting ${username} user from ${groupname} group ..."
534
@@ -758,8 +767,10 @@ fi
767
768
FILE_REMOVAL_STATUS=1
769
761
-#### REMOVE NETDATA USER FROM ADDED GROUPS
762
-if [ -n "$NETDATA_ADDED_TO_GROUPS" ]; then
770
+#### REMOVE USER
771
+if user_input "Do you want to delete 'netdata' system user ? "; then
772
+ portable_del_user "netdata" || :
773
+elif [ -n "$NETDATA_ADDED_TO_GROUPS" ]; then
774
if user_input "Do you want to delete 'netdata' from following groups: '$NETDATA_ADDED_TO_GROUPS' ? "; then
775
for group in $NETDATA_ADDED_TO_GROUPS; do
776
portable_del_user_from_group "${group}" "netdata"
@@ -767,11 +778,6 @@ if [ -n "$NETDATA_ADDED_TO_GROUPS" ]; then
778
fi
779
fi
780
770
-#### REMOVE USER
771
-if user_input "Do you want to delete 'netdata' system user ? "; then
772
- portable_del_user "netdata" || :
773
-fi
774
-
781
### REMOVE GROUP
782
if user_input "Do you want to delete 'netdata' system group ? "; then
783
portable_del_group "netdata" || :