From 5cd6a6f0463b153c2e190bceca3ab5de61df9b62 Mon Sep 17 00:00:00 2001
From: "William Hirigoyen (Evolix)" <whirigoyen@evolix.fr>
Date: Thu, 2 Dec 2021 10:16:12 +0100
Subject: [PATCH] Test if user www-login exists before deleting (else, the
 deletion fails)

---
 scripts/web-add.sh | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/scripts/web-add.sh b/scripts/web-add.sh
index e71da64..5647f71 100755
--- a/scripts/web-add.sh
+++ b/scripts/web-add.sh
@@ -730,11 +730,15 @@ op_del() {
 
     set -x
     if [ "$WEB_SERVER" == "apache" ]; then
-        userdel -f www-"$login"
+        if id www-"$login" &> /dev/null; then
+            userdel -f www-"$login"
+        fi
     fi
     userdel -f "$login"
     for php_version in "${PHP_VERSIONS[@]}"; do
-        lxc-attach -n php"${php_version}" -- userdel -f www-"$login"
+        if lxc-attach -n php"${php_version}" -- id www-"$login" &> /dev/null; then
+            lxc-attach -n php"${php_version}" -- userdel -f www-"$login"
+        fi
         lxc-attach -n php"${php_version}" -- userdel -f "$login"
     done
     sed -i.bak "/^$login:/d" /etc/aliases