From 2fb0ff0c5bcb751159c6601ca3647d68622ef02b Mon Sep 17 00:00:00 2001
From: Peter Eisentraut <peter_e@gmx.net>
Date: Thu, 10 Feb 2000 20:08:58 +0000
Subject: Default argument for createdb Changed EXIT_ON_ERROR to ON_ERROR_STOP
 in psql

---
 src/bin/scripts/createdb | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

(limited to 'src/bin/scripts/createdb')

diff --git a/src/bin/scripts/createdb b/src/bin/scripts/createdb
index 3fba2ae0e59..fd07e27292a 100644
--- a/src/bin/scripts/createdb
+++ b/src/bin/scripts/createdb
@@ -11,7 +11,7 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/bin/scripts/Attic/createdb,v 1.7 2000/01/19 20:08:35 petere Exp $
+#    $Header: /cvsroot/pgsql/src/bin/scripts/Attic/createdb,v 1.8 2000/02/10 20:08:58 petere Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -126,7 +126,7 @@ fi
 
 if [ -n "$MB" ]
 then
-        mbcode=`pg_encoding "$MB"`
+        mbcode=`${PATHNAME}pg_encoding "$MB"`
         if [ -z "$mbcode" ]
 	then
 		echo "$CMDNAME: \"$MB\" is not a valid encoding name"
@@ -135,9 +135,12 @@ then
 fi
 
 if [ -z "$dbname" ]; then
-	echo "$CMDNAME: missing required argument database name"
-        echo "Try -? for help."
-	exit 1
+        if [ "$PGUSER" ]; then
+                dbname=$PGUSER
+        else
+                dbname=`${PATHNAME}pg_id -u -n`
+        fi
+        [ $? -ne 0 ] && exit 1
 fi
 
 
-- 
cgit v1.2.3