improve comments and use better variable names

This commit is contained in:
Matt Coddington 2012-02-07 12:38:21 -05:00
parent 4d845b3fea
commit 908e74689c
1 changed files with 10 additions and 7 deletions

View File

@ -37,14 +37,15 @@ if grep -q "^${name}:" "$__object/explorer/passwd"; then
if $(echo "$new_value" | grep -q '^[0-9][0-9]*$'); then
field=4
else
# we were passed a group name. compare to current gid and
# set $current_value to $oldgid if it needs changing.
newgid=$(awk -F: '{ print $3 }' "$__object/explorer/group")
oldgid=$(awk -F: '{ print $4 }' "$file")
if [ "$newgid" != "$oldgid" ]; then
current_value="$oldgid"
# We were passed a group name. Compare the gid in
# the user's /etc/passwd entry with the gid of the
# group returned by the group explorer.
gid_from_group=$(awk -F: '{ print $3 }' "$__object/explorer/group")
gid_from_passwd=$(awk -F: '{ print $4 }' "$file")
if [ "$gid_from_group" != "$gid_from_passwd" ]; then
current_value="$gid_from_passwd"
else
current_value=$new_value
current_value="$new_value"
fi
fi
;;
@ -58,6 +59,8 @@ if grep -q "^${name}:" "$__object/explorer/passwd"; then
uid) field=3 ;;
esac
# If we haven't already set $current_value above, pull it from the
# appropriate file/field.
if [ -z "$current_value" ]; then
export field
current_value="$(awk -F: '{ print $ENVIRON["field"] }' < "$file")"