diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/bin/scripts/createuser | 30 | ||||
| -rw-r--r-- | src/bin/scripts/dropdb | 19 | ||||
| -rw-r--r-- | src/bin/scripts/droplang | 13 | ||||
| -rw-r--r-- | src/bin/scripts/dropuser | 21 |
4 files changed, 52 insertions, 31 deletions
diff --git a/src/bin/scripts/createuser b/src/bin/scripts/createuser index 70e095bf2a7..c3d00d1ea71 100644 --- a/src/bin/scripts/createuser +++ b/src/bin/scripts/createuser @@ -8,7 +8,7 @@ # # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/bin/scripts/Attic/createuser,v 1.1 1999/12/04 04:53:21 momjian Exp $ +# $Header: /cvsroot/pgsql/src/bin/scripts/Attic/createuser,v 1.2 1999/12/05 20:52:54 momjian Exp $ # # Note - this should NOT be setuid. # @@ -24,6 +24,16 @@ PwPrompt= Password= PSQLOPT= +# Check for echo -n vs echo \c + +if echo '\c' | grep -s c >/dev/null 2>&1 +then + ECHO_N="echo -n" + ECHO_C="" +else + ECHO_N="echo" + ECHO_C='\c' +fi while [ $# -gt 0 ] do @@ -92,19 +102,19 @@ fi # Get missing user attributes if [ -z "$NewUser" ]; then - echo -n "Enter name of user to add: " - read -r NewUser + $ECHO_N "Enter name of user to add: "$ECHO_C + read NewUser [ $? -ne 0 ] && exit 1 fi if [ "$PwPrompt" ]; then - echo -n "Enter password for user $NewUser: " - read -r Password + $ECHO_N "Enter password for user $NewUser: "$ECHO_C + read Password fi if [ -z "$CanCreateDb" ]; then - echo -n "Is the new user allowed to create databases? (y/n) " - read -r + $ECHO_N "Is the new user allowed to create databases? (y/n) "$ECHO_C + read REPLY [ $? -ne 0 ] && exit 1 if [ $REPLY = "y" -o $REPLY = "Y" ]; then CanCreateDb=t @@ -114,8 +124,8 @@ if [ -z "$CanCreateDb" ]; then fi if [ -z "$CanAddUser" ]; then - echo -n "Shall the new user be allowed to create more new users? (y/n) " - read -r + $ECHO_N "Shall the new user be allowed to create more new users? (y/n) "$ECHO_C + read REPLY [ $? -ne 0 ] && exit 1 if [ $REPLY = "y" -o $REPLY = "Y" ]; then CanAddUser=t @@ -142,4 +152,4 @@ if [ $? -ne 0 ]; then exit 1 fi -exit 0
\ No newline at end of file +exit 0 diff --git a/src/bin/scripts/dropdb b/src/bin/scripts/dropdb index 96a0a10cb62..93727fd2525 100644 --- a/src/bin/scripts/dropdb +++ b/src/bin/scripts/dropdb @@ -10,7 +10,7 @@ # # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/bin/scripts/Attic/dropdb,v 1.1 1999/12/04 04:53:21 momjian Exp $ +# $Header: /cvsroot/pgsql/src/bin/scripts/Attic/dropdb,v 1.2 1999/12/05 20:52:54 momjian Exp $ # #------------------------------------------------------------------------- @@ -20,6 +20,17 @@ PSQLOPT= dbname= forcedel=t +# Check for echo -n vs echo \c + +if echo '\c' | grep -s c >/dev/null 2>&1 +then + ECHO_N="echo -n" + ECHO_C="" +else + ECHO_N="echo" + ECHO_C='\c' +fi + while [ $# -gt 0 ] do case "$1" in @@ -75,8 +86,8 @@ fi if [ "$forcedel" = f ]; then echo "Database \"$dbname\" will be permanently deleted." - echo -n "Are you sure? (y/n) " - read -r + $ECHO_N "Are you sure? (y/n) "$ECHO_C + read REPLY [ $? -eq 1 ] && exit 1 [ "$REPLY" != "y" -a "$REPLY" != "Y" ] && exit 0 @@ -89,4 +100,4 @@ if [ $? -ne 0 ]; then exit 1 fi -exit 0
\ No newline at end of file +exit 0 diff --git a/src/bin/scripts/droplang b/src/bin/scripts/droplang index 1040c33dd46..dffe7dc8877 100644 --- a/src/bin/scripts/droplang +++ b/src/bin/scripts/droplang @@ -8,7 +8,7 @@ # # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/bin/scripts/Attic/droplang,v 1.1 1999/12/05 20:02:48 momjian Exp $ +# $Header: /cvsroot/pgsql/src/bin/scripts/Attic/droplang,v 1.2 1999/12/05 20:52:54 momjian Exp $ # #------------------------------------------------------------------------- @@ -20,17 +20,6 @@ langname= echo= list= -# Check for echo -n vs echo \c - -if echo '\c' | grep -s c >/dev/null 2>&1 -then - ECHO_N="echo -n" - ECHO_C="" -else - ECHO_N="echo" - ECHO_C='\c' -fi - # ---------- # Get options, language name and dbname diff --git a/src/bin/scripts/dropuser b/src/bin/scripts/dropuser index da2da3cf5a4..9b631d5c9b9 100644 --- a/src/bin/scripts/dropuser +++ b/src/bin/scripts/dropuser @@ -8,7 +8,7 @@ # # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/bin/scripts/Attic/dropuser,v 1.1 1999/12/04 04:53:21 momjian Exp $ +# $Header: /cvsroot/pgsql/src/bin/scripts/Attic/dropuser,v 1.2 1999/12/05 20:52:54 momjian Exp $ # # Note - this should NOT be setuid. # @@ -18,6 +18,17 @@ CMDNAME=`basename $0` PSQLOPT= forcedel=t +# Check for echo -n vs echo \c + +if echo '\c' | grep -s c >/dev/null 2>&1 +then + ECHO_N="echo -n" + ECHO_C="" +else + ECHO_N="echo" + ECHO_C='\c' +fi + while [ $# -gt 0 ] do case "$1" in @@ -72,16 +83,16 @@ fi # Prompt for username if missing if [ -z "$DelUser" ]; then - echo -n "Enter name of user to delete: " - read -r NewUser + $ECHO_N "Enter name of user to delete: "$ECHO_C + read NewUser [ $? -ne 0 ] && exit 1 fi if [ "$forcedel" = f ]; then echo "User \"$DelUser\" and any owned databases will be permanently deleted." - echo -n "Are you sure? (y/n) " - read -r + $ECHO_N "Are you sure? (y/n) "$ECHO_C + read REPLY [ $? -eq 1 ] && exit 1 [ "$REPLY" != "y" -a "$REPLY" != "Y" ] && exit 0 |