diff options
author | Yann E. MORIN <yann.morin.1998@free.fr> | 2014-04-05 18:24:43 +0200 |
---|---|---|
committer | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2014-04-05 18:39:16 +0200 |
commit | 4955a31cecb698def9eb4b395fc297e56f76d492 (patch) | |
tree | 8aed80e7e8db49d56f3df370ebeab3d9c4894f52 /support | |
parent | c09b2bfaeaa165ccd732da787c9e28536605dc15 (diff) | |
download | buildroot-4955a31cecb698def9eb4b395fc297e56f76d492.tar.gz buildroot-4955a31cecb698def9eb4b395fc297e56f76d492.zip |
support/mkusers: fix warnings when adding a new user
When adding a new user (or a new group), we would get warnings, like:
[...]/support/scripts/mkusers: line 145: [: too many arguments
This is because we're checking if a UID (or a GID) is already defined,
and/or is different from the requested one, both checks in the same
test.
Of course, if a UID (or a GID) is not defined, it does not have a value,
so we can not compare it to an integer.
Fix that by splitting the test in two, so the second is only executed if
the first is sucessful.
Reported-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Diffstat (limited to 'support')
-rwxr-xr-x | support/scripts/mkusers | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/support/scripts/mkusers b/support/scripts/mkusers index 90d1df7f74..3fa0fa84c8 100755 --- a/support/scripts/mkusers +++ b/support/scripts/mkusers @@ -137,12 +137,16 @@ check_user_validity() { fi # check the group does not already exists with another gid - if [ -n "${_gid}" -a ${_gid} -ne ${gid} ]; then + # Need to split the check in two, otherwise '[' complains it + # is missing arguments when _gid is empty + if [ -n "${_gid}" ] && [ ${_gid} -ne ${gid} ]; then fail "group already exists with gid '${_gid}'\n" fi # check the user does not already exists with another gid - if [ -n "${_ugid}" -a ${_ugid} -ne ${gid} ]; then + # Need to split the check in two, otherwise '[' complains it + # is missing arguments when _ugid is empty + if [ -n "${_ugid}" ] && [ ${_ugid} -ne ${gid} ]; then fail "user already exists with gid '${_ugid}'\n" fi fi @@ -156,7 +160,9 @@ check_user_validity() { fi # check the user does not already exists with another uid - if [ -n "${_uid}" -a ${_uid} -ne ${uid} ]; then + # Need to split the check in two, otherwise '[' complains it + # is missing arguments when _uid is empty + if [ -n "${_uid}" ] && [ ${_uid} -ne ${uid} ]; then fail "user already exists with uid '${_uid}'\n" fi fi |