From 715347a908967ccb565208263e10059e4c57381f Mon Sep 17 00:00:00 2001
From: Bryan Roessler <bryanroessler@gmail.com>
Date: Sun, 30 Jun 2024 18:25:49 -0400
Subject: [PATCH] Improve user remove script

---
 script-user-remove | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/script-user-remove b/script-user-remove
index ce5abb46..80924936 100755
--- a/script-user-remove
+++ b/script-user-remove
@@ -19,7 +19,7 @@ else
     prompt user
 fi
 
-if ! id -u "$user"; then
+if ! id -u "$user" &>/dev/null; then
     echo "User $user does not exist"
     exit 1
 fi
@@ -40,6 +40,10 @@ smbpasswd -x "$user"
 sed -i "/$user/d" /etc/subuid
 sed -i "/$user/d" /etc/subgid
 
-userdel -fr "$user"
+if ! userdel -fr "$user"; then
+  ask_ok "Userdel failed, kill processes again and retry?" || exit 1
+  killall -u "$user" -s SIGKILL
+  userdel -fr "$user"
+fi
 
 exit $?