Skip to content

Commit ae88b1f

Browse files
committed
Better user messages.
1 parent 70125b0 commit ae88b1f

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

update-passwd.tool

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -344,13 +344,13 @@ fi
344344
# Setup group
345345
echo "Checking to see if the group ${GROUPNAME} exists:"
346346
if [ ! -z "$(dscacheutil -q group -a name "${GROUPNAME}" 2> /dev/null)" ]; then
347-
echo "${GROUPNAME} exists."
347+
echo "Group ${GROUPNAME} already exists."
348348
elif [ ! -z "$(dscacheutil -q group -a name "_${GROUPNAME}" 2> /dev/null)" ]; then
349-
echo "_${GROUPNAME} exists; creating alias..."
349+
echo "Group _${GROUPNAME} exists; creating alias..."
350350
groupAlias "_${GROUPNAME}" "${GROUPNAME}"
351351
dscl . -merge "/groups/_${GROUPNAME}" GroupMembership "${MEMBERS}"
352352
else
353-
echo "${GROUPNAME} does not exist; creating..."
353+
echo "Group ${GROUPNAME} does not exist; creating..."
354354
gidNumber="$(gidNumber "${GROUPNAME}")"
355355
if [ "${sysadminctlVersionRun}" = "1" ]; then
356356
dseditgroupGroup "${GROUPNAME}" "${gidNumber}" "${MEMBERS}"
@@ -366,12 +366,12 @@ if [ "${opMode}" = "user" ]; then
366366
echo "Checking to see if the user ${SHORTNAME} exists:"
367367
fi
368368
if [ "${opMode}" = "user" ] && [ ! -z "$(dscacheutil -q user -a name "${SHORTNAME}" 2> /dev/null)" ]; then
369-
echo "${SHORTNAME} exists."
369+
echo "User ${SHORTNAME} already exists."
370370
elif [ "${opMode}" = "user" ] && [ ! -z "$(dscacheutil -q user -a name "_${SHORTNAME}" 2> /dev/null)" ]; then
371-
echo "_${SHORTNAME} exists; creating alias..."
371+
echo "User _${SHORTNAME} exists; creating alias..."
372372
userAlias "_${SHORTNAME}" "${SHORTNAME}"
373373
elif [ "${opMode}" = "user" ]; then
374-
echo "${SHORTNAME} does not exist; creating..."
374+
echo "User ${SHORTNAME} does not exist; creating..."
375375
: "${gidNumber="$(dscl . -read "/groups/${GROUPNAME}" PrimaryGroupID | cut -d ' ' -f '2')"}"
376376
if [ "${sysadminctlVersionRun}" = "1" ]; then
377377
dsImport "${SHORTNAME}" "$(uidNumber "${SHORTNAME}")" "${gidNumber}" "${HOME}" "${SHELL}" "${INFO}"

0 commit comments

Comments
 (0)