diff options
| author | Bruce Momjian <bruce@momjian.us> | 2002-04-12 09:42:32 +0000 |
|---|---|---|
| committer | Bruce Momjian <bruce@momjian.us> | 2002-04-12 09:42:32 +0000 |
| commit | 0847fea6b93eace69db216f9990ae45041ec78d2 (patch) | |
| tree | 8739a399dc310dacd554e10013192b7f6e755517 | |
| parent | 5804a7ce3e210cfd3f7ac1cce693a47004c7a00c (diff) | |
| download | postgresql-0847fea6b93eace69db216f9990ae45041ec78d2.tar.gz postgresql-0847fea6b93eace69db216f9990ae45041ec78d2.zip | |
Allow prompting of create/drop user to handle spaces.
| -rw-r--r-- | src/bin/scripts/createuser | 14 | ||||
| -rw-r--r-- | src/bin/scripts/dropuser | 10 |
2 files changed, 20 insertions, 4 deletions
diff --git a/src/bin/scripts/createuser b/src/bin/scripts/createuser index 9f0088f0877..b21ba0fcf08 100644 --- a/src/bin/scripts/createuser +++ b/src/bin/scripts/createuser @@ -9,7 +9,7 @@ # # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/bin/scripts/Attic/createuser,v 1.24 2002/04/12 09:37:10 momjian Exp $ +# $Header: /cvsroot/pgsql/src/bin/scripts/Attic/createuser,v 1.25 2002/04/12 09:42:31 momjian Exp $ # # Note - this should NOT be setuid. # @@ -27,6 +27,10 @@ Password= PSQLOPT= Encrypted= # blank uses default +# These handle spaces/tabs in identifiers +_IFS="$IFS" +NL=" +" # Check for echo -n vs echo \c if echo '\c' | grep -s c >/dev/null 2>&1 @@ -178,19 +182,25 @@ trap 'stty echo >/dev/null 2>&1' 1 2 3 15 if [ -z "$NewUser" ]; then $ECHO_N "Enter name of user to add: "$ECHO_C - read NewUser + IFS="$NL" + read NewUser + IFS="$_IFS" [ "$?" -ne 0 ] && exit 1 fi if [ "$PwPrompt" ]; then $ECHO_N "Enter password for user \"$NewUser\": "$ECHO_C stty -echo >/dev/null 2>&1 + IFS="$NL" read FirstPw + IFS="$_IFS" stty echo >/dev/null 2>&1 echo $ECHO_N "Enter it again: "$ECHO_C stty -echo >/dev/null 2>&1 + IFS="$NL" read SecondPw + IFS="$_IFS" stty echo >/dev/null 2>&1 echo if [ "$FirstPw" != "$SecondPw" ]; then diff --git a/src/bin/scripts/dropuser b/src/bin/scripts/dropuser index 803b7caad15..4e4b03d8ca0 100644 --- a/src/bin/scripts/dropuser +++ b/src/bin/scripts/dropuser @@ -9,7 +9,7 @@ # # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/bin/scripts/Attic/dropuser,v 1.16 2002/04/12 09:37:11 momjian Exp $ +# $Header: /cvsroot/pgsql/src/bin/scripts/Attic/dropuser,v 1.17 2002/04/12 09:42:32 momjian Exp $ # # Note - this should NOT be setuid. # @@ -22,6 +22,10 @@ PSQLOPT= forcedel=t DelUser= +# These handle spaces/tabs in identifiers +_IFS="$IFS" +NL=" +" # Check for echo -n vs echo \c if echo '\c' | grep -s c >/dev/null 2>&1 @@ -125,7 +129,9 @@ fi if [ -z "$DelUser" ]; then $ECHO_N "Enter name of user to delete: "$ECHO_C - read DelUser + IFS="$NL" + read DelUser + IFS="$_IFS" [ "$?" -ne 0 ] && exit 1 fi |