Better gender-neutral language.

[pw-darwin.git] / adduser / adduser.sh

diff --git a/adduser/adduser.sh b/adduser/adduser.sh
index ef595930e7090e530820a024bd518e933c8669d2..96049bd844718010fffb9cedcf6dc4d197ff03a2 100644 (file)
--- a/adduser/adduser.sh
+++ b/adduser/adduser.sh
@@ -145,7 +145,7 @@ fullpath_from_shell() {
 save_config() {
        echo "# Configuration file for adduser(8)."     >  ${ADDUSERCONF}
        echo "# NOTE: only *some* variables are saved." >> ${ADDUSERCONF}
-       echo "# Last Modified on `date`."                     >> ${ADDUSERCONF}
+       echo "# Last Modified on `${DATECMD}`."         >> ${ADDUSERCONF}
        echo ''                         >> ${ADDUSERCONF}
        echo "defaultclass=$uclass"     >> ${ADDUSERCONF}
        echo "defaultgroups=$ugroups"   >> ${ADDUSERCONF}
@@ -186,15 +186,15 @@ add_user() {
        _upasswd=
        _passwdmethod=
 
-       _name="-n $username"
-       [ -n "$uuid" ] && _uid="-u $uuid"
-       [ -n "$ulogingroup" ] && _group="-g $ulogingroup"
-       [ -n "$ugroups" ] && _grouplist="-G $ugroups"
-       [ -n "$ushell" ] && _shell="-s $ushell"
-       [ -n "$uhome" ] && _home="-m -d $uhome"
-       [ -n "$uclass" ] && _class="-L $uclass"
+       _name="-n '$username'"
+       [ -n "$uuid" ] && _uid="-u '$uuid'"
+       [ -n "$ulogingroup" ] && _group="-g '$ulogingroup'"
+       [ -n "$ugroups" ] && _grouplist="-G '$ugroups'"
+       [ -n "$ushell" ] && _shell="-s '$ushell'"
+       [ -n "$uhome" ] && _home="-m -d '$uhome'"
+       [ -n "$uclass" ] && _class="-L '$uclass'"
        [ -n "$ugecos" ] && _comment="-c '$ugecos'"
-       [ -n "$udotdir" ] && _dotdir="-k $udotdir"
+       [ -n "$udotdir" ] && _dotdir="-k '$udotdir'"
        [ -n "$uexpire" ] && _expire="-e '$uexpire'"
        [ -n "$upwexpire" ] && _pwexpire="-p '$upwexpire'"
        case $passwdtype in
@@ -205,7 +205,7 @@ add_user() {
        yes)
                _passwdmethod="-w yes"
                _passwd="-h 0"
-               _upasswd="echo $upass |"
+               _upasswd="echo '$upass' |"
                ;;
        none)
                _passwdmethod="-w none"
@@ -328,7 +328,7 @@ get_shell() {
        ushell="$defaultshell"
 
        # Make sure the current value of the shell is a valid one
-       _shellchk="grep '^$ushell$' ${ETCSHELLS} > /dev/null 2>&1"
+       _shellchk="${GREPCMD} '^$ushell$' ${ETCSHELLS} > /dev/null 2>&1"
        eval $_shellchk || {
                err "Invalid shell ($ushell). Using default shell ${defaultshell}."
                ushell="$defaultshell"
@@ -394,7 +394,7 @@ get_uid() {
                _prompt="Uid (Leave empty for default): "
        fi
        if [ -z "$fflag" ]; then
-               echo -n $_prompt
+               echo -n "$_prompt"
                read _input
        else
                _input="`echo "$fileline" | cut -f2 -d:`"
@@ -601,6 +601,7 @@ input_interactive() {
                                                ;;
                                        esac
                                        passwdtype="yes"
+                                       [ -n "$configrun" ] && break
                                        trap 'stty echo; exit' 0 1 2 3 15
                                        stty -echo
                                        echo -n "Enter password: "
@@ -677,7 +678,8 @@ input_interactive() {
                _pass='<random>'
                ;;
        esac
-       printf "%-10s : %s\n" "Password" "$_pass"
+       [ -z "$configflag" ] && printf "%-10s : %s\n" "Password" "$_pass"
+       [ -n "$configflag" ] && printf "%-10s : %s\n" "Pass Type" "$passwdtype"
        [ -z "$configflag" ] && printf "%-10s : %s\n" "Full Name" "$ugecos"
        [ -z "$configflag" ] && printf "%-10s : %s\n" "Uid" "$uuid"
        printf "%-10s : %s\n" "Class" "$uclass"
@@ -712,6 +714,8 @@ ADDUSERCONF="${ADDUSERCONF:-/etc/adduser.conf}"
 PWCMD="${PWCMD:-/usr/sbin/pw}"
 MAILCMD="${MAILCMD:-mail}"
 ETCSHELLS="${ETCSHELLS:-/etc/shells}"
+GREPCMD="/usr/bin/grep"
+DATECMD="/bin/date"
 
 # Set default values
 #
@@ -871,4 +875,22 @@ if [ -n "$fflag" ]; then
        fi
 else
        input_interactive
+       while : ; do
+               echo -n "Add another user? (yes/no): "
+               read _input
+               case $_input in
+               [Yy][Ee][Ss]|[Yy][Ee]|[Yy])
+                       uidstart=`get_nextuid $uidstart`
+                       input_interactive
+                       continue
+                       ;;
+               [Nn][Oo]|[Nn])
+                       echo "Goodbye!"
+                       ;;
+               *)
+                       continue
+                       ;;
+               esac
+               break
+       done
 fi