From c6f94644a0ea716375c1e90cbaa2424588a1a6c7 Mon Sep 17 00:00:00 2001 From: Bruce Momjian Date: Sun, 30 Sep 2001 22:17:51 +0000 Subject: [PATCH] These are further fixes for double quotes missing in the various shell scripts. Justin Clift --- src/bin/initdb/initdb.sh | 4 ++-- src/bin/initlocation/initlocation.sh | 10 +++++----- src/bin/ipcclean/ipcclean.sh | 8 ++++---- src/bin/pg_config/pg_config.sh | 6 +++--- src/bin/pg_dump/pg_dumpall.sh | 4 ++-- src/bin/scripts/createdb | 10 +++++----- src/bin/scripts/createlang.sh | 10 +++++----- src/bin/scripts/createuser | 12 ++++++------ src/bin/scripts/dropdb | 8 ++++---- src/bin/scripts/droplang | 18 +++++++++--------- src/bin/scripts/dropuser | 10 +++++----- src/bin/scripts/vacuumdb | 6 +++--- 12 files changed, 53 insertions(+), 53 deletions(-) diff --git a/src/bin/initdb/initdb.sh b/src/bin/initdb/initdb.sh index ae16fe1c0e..8f4eb65787 100644 --- a/src/bin/initdb/initdb.sh +++ b/src/bin/initdb/initdb.sh @@ -27,7 +27,7 @@ # Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group # Portions Copyright (c) 1994, Regents of the University of California # -# $Header: /cvsroot/pgsql/src/bin/initdb/Attic/initdb.sh,v 1.137 2001/09/08 15:24:00 petere Exp $ +# $Header: /cvsroot/pgsql/src/bin/initdb/Attic/initdb.sh,v 1.138 2001/09/30 22:17:50 momjian Exp $ # #------------------------------------------------------------------------- @@ -539,7 +539,7 @@ EOF if [ "$?" -ne 0 ]; then exit_nicely fi - if [ ! -f $PGDATA/global/pg_pwd ]; then + if [ ! -f "$PGDATA"/global/pg_pwd ]; then echo echo "The password file wasn't generated. Please report this problem." 1>&2 exit_nicely diff --git a/src/bin/initlocation/initlocation.sh b/src/bin/initlocation/initlocation.sh index 5bd6468c1e..4cf965776c 100644 --- a/src/bin/initlocation/initlocation.sh +++ b/src/bin/initlocation/initlocation.sh @@ -9,7 +9,7 @@ # # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/bin/initlocation/Attic/initlocation.sh,v 1.11 2001/02/18 18:33:59 momjian Exp $ +# $Header: /cvsroot/pgsql/src/bin/initlocation/Attic/initlocation.sh,v 1.12 2001/09/30 22:17:50 momjian Exp $ # #------------------------------------------------------------------------- @@ -125,10 +125,10 @@ trap 'echo "Caught signal." ; exit_nicely' 1 2 3 15 # umask must disallow access to group, other for files and dirs umask 077 -if [ ! -d $PGALTDATA ]; then +if [ ! -d "$PGALTDATA" ]; then echo "Creating directory $PGALTDATA" mkdir "$PGALTDATA" - if [ $? -ne 0 ]; then + if [ "$?" -ne 0 ]; then echo "$CMDNAME: could not create $PGALTDATA" 1>&2 echo "Make sure $PGALTDATA is a valid path and that you have permission to access it." 1>&2 exit_nicely @@ -139,10 +139,10 @@ else fi -if [ ! -d $PGALTDATA/base ]; then +if [ ! -d "$PGALTDATA"/base ]; then echo "Creating directory $PGALTDATA/base" mkdir "$PGALTDATA/base" - if [ $? -ne 0 ]; then + if [ "$?" -ne 0 ]; then echo "$CMDNAME: could not create $PGALTDATA/base" 1>&2 echo "Make sure $PGALTDATA/base is a valid path and that you have permission to access it." 1>&2 exit_nicely diff --git a/src/bin/ipcclean/ipcclean.sh b/src/bin/ipcclean/ipcclean.sh index 881391e641..d3ce8eae20 100644 --- a/src/bin/ipcclean/ipcclean.sh +++ b/src/bin/ipcclean/ipcclean.sh @@ -1,6 +1,6 @@ #!/bin/sh # -# $Header: /cvsroot/pgsql/src/bin/ipcclean/Attic/ipcclean.sh,v 1.11 2001/05/24 15:53:33 momjian Exp $ +# $Header: /cvsroot/pgsql/src/bin/ipcclean/Attic/ipcclean.sh,v 1.12 2001/09/30 22:17:50 momjian Exp $ # CMDNAME=`basename $0` @@ -74,14 +74,14 @@ if [ `uname` = 'Linux' ]; then # (This check is conceptually phony, but it's # useful anyway in practice.) ps hj $ipcs_cpid $ipcs_lpid >/dev/null 2>&1 - if [ $? -eq 0 ]; then + if [ "$?" -eq 0 ]; then echo "skipped; process still exists (pid $ipcs_cpid or $ipcs_lpid)." continue fi # try remove ipcrm shm $ipcs_shmid - if [ $? -eq 0 ]; then + if [ "$?" -eq 0 ]; then did_anything=t else exit @@ -93,7 +93,7 @@ if [ `uname` = 'Linux' ]; then echo -n "Semaphore $val ... " # try remove ipcrm sem $val - if [ $? -eq 0 ]; then + if [ "$?" -eq 0 ]; then did_anything=t else exit diff --git a/src/bin/pg_config/pg_config.sh b/src/bin/pg_config/pg_config.sh index e27827cc28..c034c0b9dd 100644 --- a/src/bin/pg_config/pg_config.sh +++ b/src/bin/pg_config/pg_config.sh @@ -7,7 +7,7 @@ # Author: Peter Eisentraut # Public domain -# $Header: /cvsroot/pgsql/src/bin/pg_config/Attic/pg_config.sh,v 1.5 2001/09/16 16:11:11 petere Exp $ +# $Header: /cvsroot/pgsql/src/bin/pg_config/Attic/pg_config.sh,v 1.6 2001/09/30 22:17:51 momjian Exp $ me=`basename $0` @@ -41,7 +41,7 @@ Report bugs to ." advice="\ Try '$me --help' for more information." -if test $# -eq 0 ; then +if test "$#" -eq 0 ; then echo "$me: argument required" 1>&2 echo "$advice" 1>&2 exit 1 @@ -51,7 +51,7 @@ show= for opt do - case $opt in + case "$opt" in --bindir) show="$show \$val_bindir";; --includedir) show="$show \$val_includedir";; --includedir-server) diff --git a/src/bin/pg_dump/pg_dumpall.sh b/src/bin/pg_dump/pg_dumpall.sh index 7af04a71c3..2029c0fc79 100644 --- a/src/bin/pg_dump/pg_dumpall.sh +++ b/src/bin/pg_dump/pg_dumpall.sh @@ -6,7 +6,7 @@ # and "pg_group" tables, which belong to the whole installation rather # than any one individual database. # -# $Header: /cvsroot/pgsql/src/bin/pg_dump/Attic/pg_dumpall.sh,v 1.12 2001/05/17 21:12:49 petere Exp $ +# $Header: /cvsroot/pgsql/src/bin/pg_dump/Attic/pg_dumpall.sh,v 1.13 2001/09/30 22:17:51 momjian Exp $ CMDNAME=`basename $0` @@ -77,7 +77,7 @@ cleanschema= globals_only= -while [ $# -gt 0 ] ; do +while [ "$#" -gt 0 ] ; do case $1 in --help) usage=t diff --git a/src/bin/scripts/createdb b/src/bin/scripts/createdb index 8f88586330..95e8c12d75 100644 --- a/src/bin/scripts/createdb +++ b/src/bin/scripts/createdb @@ -12,7 +12,7 @@ # # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/bin/scripts/Attic/createdb,v 1.17 2001/09/22 04:28:12 momjian Exp $ +# $Header: /cvsroot/pgsql/src/bin/scripts/Attic/createdb,v 1.18 2001/09/30 22:17:51 momjian Exp $ # #------------------------------------------------------------------------- @@ -26,7 +26,7 @@ dbname= dbcomment= dbpath= -while [ $# -gt 0 ] +while [ "$#" -gt 0 ] do case "$1" in --help|-\?) @@ -154,7 +154,7 @@ if [ -z "$dbname" ]; then else dbname=`${PATHNAME}pg_id -u -n` fi - [ $? -ne 0 ] && exit 1 + [ "$?" -ne 0 ] && exit 1 fi @@ -170,7 +170,7 @@ withstring= [ "$withstring" ] && withstring=" WITH$withstring" ${PATHNAME}psql $PSQLOPT -d template1 -c "CREATE DATABASE \"$dbname\"$withstring" -if [ $? -ne 0 ]; then +if [ "$?" -ne 0 ]; then echo "$CMDNAME: database creation failed" 1>&2 exit 1 fi @@ -181,7 +181,7 @@ fi dbcomment=`echo "$dbcomment" | sed "s/'/\\\\\'/g"` ${PATHNAME}psql $PSQLOPT -d template1 -c "COMMENT ON DATABASE \"$dbname\" IS '$dbcomment'" -if [ $? -ne 0 ]; then +if [ "$?" -ne 0 ]; then echo "$CMDNAME: comment creation failed (database was created)" 1>&2 exit 1 fi diff --git a/src/bin/scripts/createlang.sh b/src/bin/scripts/createlang.sh index 12c54943b7..121fa8cde1 100644 --- a/src/bin/scripts/createlang.sh +++ b/src/bin/scripts/createlang.sh @@ -7,7 +7,7 @@ # Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group # Portions Copyright (c) 1994, Regents of the University of California # -# $Header: /cvsroot/pgsql/src/bin/scripts/Attic/createlang.sh,v 1.30 2001/09/22 04:28:12 momjian Exp $ +# $Header: /cvsroot/pgsql/src/bin/scripts/Attic/createlang.sh,v 1.31 2001/09/30 22:17:51 momjian Exp $ # #------------------------------------------------------------------------- @@ -37,7 +37,7 @@ fi # ---------- # Get options, language name and dbname # ---------- -while [ $# -gt 0 ] +while [ "$#" -gt 0 ] do case "$1" in --help|-\?) @@ -237,7 +237,7 @@ if [ "$showsql" = yes ]; then echo "$sqlcmd" fi res=`$PSQL "$sqlcmd"` -if [ $? -ne 0 ]; then +if [ "$?" -ne 0 ]; then echo "$CMDNAME: external error" 1>&2 exit 1 fi @@ -270,7 +270,7 @@ if [ "$handlerexists" = no ]; then echo "$sqlcmd" fi $PSQL "$sqlcmd" - if [ $? -ne 0 ]; then + if [ "$?" -ne 0 ]; then echo "$CMDNAME: language installation failed" 1>&2 exit 1 fi @@ -281,7 +281,7 @@ if [ "$showsql" = yes ]; then echo "$sqlcmd" fi $PSQL "$sqlcmd" -if [ $? -ne 0 ]; then +if [ "$?" -ne 0 ]; then echo "$CMDNAME: language installation failed" 1>&2 exit 1 fi diff --git a/src/bin/scripts/createuser b/src/bin/scripts/createuser index f5ffb4d941..fa20aa101c 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.21 2001/09/22 04:28:12 momjian Exp $ +# $Header: /cvsroot/pgsql/src/bin/scripts/Attic/createuser,v 1.22 2001/09/30 22:17:51 momjian Exp $ # # Note - this should NOT be setuid. # @@ -39,7 +39,7 @@ else fi -while [ $# -gt 0 ] +while [ "$#" -gt 0 ] do case "$1" in --help|-\?) @@ -174,7 +174,7 @@ 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 - [ $? -ne 0 ] && exit 1 + [ "$?" -ne 0 ] && exit 1 fi if [ "$PwPrompt" ]; then @@ -198,7 +198,7 @@ fi if [ -z "$CanCreateDb" ]; then $ECHO_N "Shall the new user be allowed to create databases? (y/n) "$ECHO_C read REPLY - [ $? -ne 0 ] && exit 1 + [ "$?" -ne 0 ] && exit 1 if [ "$REPLY" = "y" -o "$REPLY" = "Y" ]; then CanCreateDb=t else @@ -209,7 +209,7 @@ fi if [ -z "$CanAddUser" ]; then $ECHO_N "Shall the new user be allowed to create more new users? (y/n) "$ECHO_C read REPLY - [ $? -ne 0 ] && exit 1 + [ "$?" -ne 0 ] && exit 1 if [ "$REPLY" = "y" -o "$REPLY" = "Y" ]; then CanAddUser=t else @@ -239,7 +239,7 @@ SUBQUERY= [ "$CanAddUser" = f ] && QUERY="$QUERY NOCREATEUSER" ${PATHNAME}psql -c "$QUERY" -d template1 $PSQLOPT -if [ $? -ne 0 ]; then +if [ "$?" -ne 0 ]; then echo "$CMDNAME: creation of user \"$NewUser\" failed" 1>&2 exit 1 fi diff --git a/src/bin/scripts/dropdb b/src/bin/scripts/dropdb index 0a9f166115..75ad3cea76 100644 --- a/src/bin/scripts/dropdb +++ b/src/bin/scripts/dropdb @@ -11,7 +11,7 @@ # # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/bin/scripts/Attic/dropdb,v 1.12 2001/09/22 04:28:12 momjian Exp $ +# $Header: /cvsroot/pgsql/src/bin/scripts/Attic/dropdb,v 1.13 2001/09/30 22:17:51 momjian Exp $ # #------------------------------------------------------------------------- @@ -34,7 +34,7 @@ else fi -while [ $# -gt 0 ] +while [ "$#" -gt 0 ] do case "$1" in --help|-\?) @@ -126,7 +126,7 @@ if [ "$forcedel" = f ]; then $ECHO_N "Are you sure? (y/n) "$ECHO_C read REPLY - [ $? -eq 1 ] && exit 1 + [ "$?" -eq 1 ] && exit 1 [ "$REPLY" != "y" -a "$REPLY" != "Y" ] && exit 0 fi @@ -134,7 +134,7 @@ fi dbname=`echo $dbname | sed 's/\"/\\\"/g'` ${PATHNAME}psql $PSQLOPT -d template1 -c "DROP DATABASE \"$dbname\"" -if [ $? -ne 0 ]; then +if [ "$?" -ne 0 ]; then echo "$CMDNAME: database removal failed" 1>&2 exit 1 fi diff --git a/src/bin/scripts/droplang b/src/bin/scripts/droplang index 919b237ca5..efe94186aa 100644 --- a/src/bin/scripts/droplang +++ b/src/bin/scripts/droplang @@ -7,7 +7,7 @@ # Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group # Portions Copyright (c) 1994, Regents of the University of California # -# $Header: /cvsroot/pgsql/src/bin/scripts/Attic/droplang,v 1.17 2001/09/22 04:28:12 momjian Exp $ +# $Header: /cvsroot/pgsql/src/bin/scripts/Attic/droplang,v 1.18 2001/09/30 22:17:51 momjian Exp $ # #------------------------------------------------------------------------- @@ -36,7 +36,7 @@ fi # ---------- # Get options, language name and dbname # ---------- -while [ $# -gt 0 ] +while [ "$#" -gt 0 ] do case "$1" in --help|-\?) @@ -168,7 +168,7 @@ if [ "$showsql" = yes ]; then echo "$sqlcmd" fi lanplcallfoid=`$PSQL "$sqlcmd"` -if [ $? -ne 0 ]; then +if [ "$?" -ne 0 ]; then echo "$CMDNAME: external error" 1>&2 exit 1 fi @@ -186,13 +186,13 @@ if [ "$showsql" = yes ]; then echo "$sqlcmd" fi res=`$PSQL "$sqlcmd"` -if [ $? -ne 0 ]; then +if [ "$?" -ne 0 ]; then echo "$CMDNAME: external error" 1>&2 exit 1 fi if [ "$res" -ne 0 ]; then echo "$CMDNAME: There are $res functions/trigger procedures declared in language" 1>&2 - echo "$langname. Language not removed." 1>&2 + echo "$langname. Language not removed." 1>&2 exit 1 fi @@ -204,7 +204,7 @@ if [ "$showsql" = yes ]; then echo "$sqlcmd" fi res=`$PSQL "$sqlcmd"` -if [ $? -ne 0 ]; then +if [ "$?" -ne 0 ]; then echo "$CMDNAME: external error" 1>&2 exit 1 fi @@ -222,7 +222,7 @@ if [ "$showsql" = yes ]; then echo "$sqlcmd" fi $PSQL "$sqlcmd" -if [ $? -ne 0 ]; then +if [ "$?" -ne 0 ]; then echo "$CMDNAME: language removal failed" 1>&2 exit 1 fi @@ -239,7 +239,7 @@ if [ "$showsql" = yes ]; then echo "$sqlcmd" fi handler=`$PSQL "$sqlcmd"` -if [ $? -ne 0 ]; then +if [ "$?" -ne 0 ]; then echo "$CMDNAME: external error" 1>&2 exit 1 fi @@ -249,7 +249,7 @@ if [ "$showsql" = yes ]; then echo "$sqlcmd" fi $PSQL "$sqlcmd" -if [ $? -ne 0 ]; then +if [ "$?" -ne 0 ]; then echo "$CMDNAME: language removal failed" 1>&2 exit 1 fi diff --git a/src/bin/scripts/dropuser b/src/bin/scripts/dropuser index fc76b6b01d..ed95ec6c73 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.13 2001/09/22 04:28:12 momjian Exp $ +# $Header: /cvsroot/pgsql/src/bin/scripts/Attic/dropuser,v 1.14 2001/09/30 22:17:51 momjian Exp $ # # Note - this should NOT be setuid. # @@ -34,7 +34,7 @@ else fi -while [ $# -gt 0 ] +while [ "$#" -gt 0 ] do case "$1" in --help|-\?) @@ -121,7 +121,7 @@ fi if [ -z "$DelUser" ]; then $ECHO_N "Enter name of user to delete: "$ECHO_C read DelUser - [ $? -ne 0 ] && exit 1 + [ "$?" -ne 0 ] && exit 1 fi @@ -130,7 +130,7 @@ if [ "$forcedel" = f ]; then $ECHO_N "Are you sure? (y/n) "$ECHO_C read REPLY - [ $? -eq 1 ] && exit 1 + [ "$?" -eq 1 ] && exit 1 [ "$REPLY" != "y" -a "$REPLY" != "Y" ] && exit 0 fi @@ -139,7 +139,7 @@ DelUser=`echo "$DelUser" | sed 's/\"/\\\"/g'` ${PATHNAME}psql $PSQLOPT -d template1 -c "DROP USER \"$DelUser\"" -if [ $? -ne 0 ]; then +if [ "$?" -ne 0 ]; then echo "$CMDNAME: deletion of user \"$DelUser\" failed" 1>&2 exit 1 fi diff --git a/src/bin/scripts/vacuumdb b/src/bin/scripts/vacuumdb index 07b3e094d6..35c8cc4b3b 100644 --- a/src/bin/scripts/vacuumdb +++ b/src/bin/scripts/vacuumdb @@ -12,7 +12,7 @@ # # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/bin/scripts/Attic/vacuumdb,v 1.18 2001/09/22 04:28:12 momjian Exp $ +# $Header: /cvsroot/pgsql/src/bin/scripts/Attic/vacuumdb,v 1.19 2001/09/30 22:17:51 momjian Exp $ # #------------------------------------------------------------------------- @@ -28,7 +28,7 @@ dbname= alldb= quiet=0 -while [ $# -gt 0 ] +while [ "$#" -gt 0 ] do case "$1" in --help|-\?) @@ -160,7 +160,7 @@ for db in $dbname do [ "$alldb" -a "$quiet" -ne 1 ] && echo "Vacuuming $db" ${PATHNAME}psql $PSQLOPT $ECHOOPT -c "VACUUM $full $verbose $analyze $table" -d $db - if [ $? -ne 0 ]; then + if [ "$?" -ne 0 ]; then echo "$CMDNAME: vacuum $table $db failed" 1>&2 exit 1 fi -- 2.40.0