*** src/bin/scripts/createdb.old Sun Sep 23 15:28:00 2001 --- src/bin/scripts/createdb Sun Sep 23 15:29:45 2001 *************** *** 26,32 **** dbcomment= dbpath= ! while [ $# -gt 0 ] do case "$1" in --help|-\?) --- 26,32 ---- dbcomment= dbpath= ! while [ "$#" -gt 0 ] do case "$1" in --help|-\?) *************** *** 154,160 **** else dbname=`${PATHNAME}pg_id -u -n` fi ! [ $? -ne 0 ] && exit 1 fi --- 154,160 ---- else dbname=`${PATHNAME}pg_id -u -n` fi ! [ "$?" -ne 0 ] && exit 1 fi *************** *** 170,176 **** [ "$withstring" ] && withstring=" WITH$withstring" ${PATHNAME}psql $PSQLOPT -d template1 -c "CREATE DATABASE \"$dbname\"$withstring" ! if [ $? -ne 0 ]; then echo "$CMDNAME: database creation failed" 1>&2 exit 1 fi --- 170,176 ---- [ "$withstring" ] && withstring=" WITH$withstring" ${PATHNAME}psql $PSQLOPT -d template1 -c "CREATE DATABASE \"$dbname\"$withstring" ! if [ "$?" -ne 0 ]; then echo "$CMDNAME: database creation failed" 1>&2 exit 1 fi *************** *** 181,187 **** dbcomment=`echo "$dbcomment" | sed "s/'/\\\\\'/g"` ${PATHNAME}psql $PSQLOPT -d template1 -c "COMMENT ON DATABASE \"$dbname\" IS '$dbcomment'" ! if [ $? -ne 0 ]; then echo "$CMDNAME: comment creation failed (database was created)" 1>&2 exit 1 fi --- 181,187 ---- dbcomment=`echo "$dbcomment" | sed "s/'/\\\\\'/g"` ${PATHNAME}psql $PSQLOPT -d template1 -c "COMMENT ON DATABASE \"$dbname\" IS '$dbcomment'" ! if [ "$?" -ne 0 ]; then echo "$CMDNAME: comment creation failed (database was created)" 1>&2 exit 1 fi