CI: Make creation of user idempotent

Signed-off-by: Simon McVittie <smcv@collabora.com>

diff --git a/tools/ci-install.sh b/tools/ci-install.sh
index c5131c374bd053e321eb3c10d14109446423d5e3..2afcd789bbf73a2334685425444a03108e49087b 100755 (executable)
--- a/tools/ci-install.sh
+++ b/tools/ci-install.sh
@@ -286,8 +286,10 @@ case "$ci_distro" in
         if [ "$ci_in_docker" = yes ]; then
             # Add the user that we will use to do the build inside the
             # Docker container, and let them use sudo
-            useradd -m user
-            passwd -ud user
+            if ! getent passwd user >/dev/null; then
+                useradd -m user
+                passwd -ud user
+            fi
             echo "user ALL=(ALL) NOPASSWD: ALL" > /etc/sudoers.d/nopasswd
             chmod 0440 /etc/sudoers.d/nopasswd
         fi