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 $?