build-setup.sh: only delete ubuntu user when present
A previous commit (58ad8018e), added code to delete the new "ubuntu"
user in the more recent ubuntu distributions. Unfortunately that
introduces an issue if someone is using an older ubuntu distribution.
The new "ubuntu" user is not present so the delete command fails:
```
"userdel: user 'ubuntu' does not exist"
```
Only delete the user if it's present in the image.
Tested:
- Confirmed script works on old and new ubuntu containers
Change-Id: I9ea89cd82d7ae6d71271ec59aac8cdf98bfca7c2
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
diff --git a/build-setup.sh b/build-setup.sh
index 71b8090..0285aea 100755
--- a/build-setup.sh
+++ b/build-setup.sh
@@ -267,7 +267,7 @@
# If the user calling this build script happens to also have a UID of 1000
# then the container no longer will work. Delete the new ubuntu user
# so there is no conflict
- RUN userdel -r ubuntu
+ RUN if id ubuntu > /dev/null 2>&1; then userdel -r ubuntu > /dev/null 2>&1; fi
RUN grep -q ${GROUPS[0]} /etc/group || groupadd -g ${GROUPS[0]} ${USER}
RUN grep -q ${UID} /etc/passwd || useradd -d ${HOME} -m -u ${UID} -g ${GROUPS[0]} ${USER}