# Output the real UID of the given user, or the empty string if the
# user does not exist on the system.
[[ $# -eq 1 ]] || die "usage: sys-user_getuid <username>"
- echo $(id --real --user "${1}")
+ echo $(id --real --user "${1}" 2>/dev/null)
}
sys-user_getname() {
usermod ${SYS_USER_UID:+--uid }"${SYS_USER_UID}" \
${SYS_USER_GROUPS:+--append --groups }"${SYS_USER_GROUPS}" \
--shell "${SYS_USER_SHELL}" \
- --home-dir "${SYS_USER_HOME}" \
+ --home "${SYS_USER_HOME}" \
"${SYS_USER_NAME}"
}
sys-user_pkg_pretend() {
# Sanity checks that would otherwise run code in global scope.
-
- # Next ensure that no other username owns an important UID.
if [[ "${SYS_USER_UID_IMPORTANT}" == "true" ]]; then
- # Ok, the UID is important. Make sure nobody else has it. Or
+
+ # The UID is important, so make sure nobody else has it. Or
# rather, nobody else *with a different username* has it.
local oldname=$(sys-user_getname "${SYS_USER_UID}")
- if [[ "${SYS_USER_NAME}" != "${oldname}" ]]; then
+ if [[ -n "${oldname}" ]] && \
+ [[ "${SYS_USER_NAME}" != "${oldname}" ]]; then
die "important UID ${SYS_USER_UID} already belongs to ${oldname}"
fi
- fi
- # Finally, ensure that this username doesn't already exist with
- # another UID if its UID is supposedly important.
- local olduid=$(sys-user_getuid "${SYS_USER_NAME}")
- if [[ -n "${olduid}" ]]; then
- if [[ "${SYS_USER_UID_IMPORTANT}" == "true" ]] && \
+ # Ensure that this username doesn't already exist with another
+ # UID if its UID is supposedly important.
+ local olduid=$(sys-user_getuid "${SYS_USER_NAME}")
+ if [[ -n "${olduid}" ]] && \
[[ "${SYS_USER_UID}" != "${olduid}" ]]; then
# The UID is important and specified, but there is already a
# system user with this name and a different UID. Halp.
fi
local current_name=$(sys-user_getname "${SYS_USER_UID}")
- if [[ "${current_name}" != "${SYS_USER_NAME}" ]]; then
+ if [[ -n "${current_name}" ]] && \
+ [[ "${current_name}" != "${SYS_USER_NAME}" ]]; then
# This UID is already taken by another user, but this
# specific UID was not important (we checked in
# pkg_pretend), so fall back to an arbitrary one.