diff options
| author | Bruce Momjian <bruce@momjian.us> | 2002-01-03 05:30:04 +0000 |
|---|---|---|
| committer | Bruce Momjian <bruce@momjian.us> | 2002-01-03 05:30:04 +0000 |
| commit | 04f3342e033709591867520d95c5a588f4d3fca1 (patch) | |
| tree | 333748c988cc33ea43a62ee4896e37875719c6f2 /src/bin/scripts/createlang.sh | |
| parent | b3d9768f3bb45876e7273d1a25a2ce5755dea3db (diff) | |
| download | postgresql-04f3342e033709591867520d95c5a588f4d3fca1.tar.gz postgresql-04f3342e033709591867520d95c5a588f4d3fca1.zip | |
In createlang, make dbname optional, not langname, or rather, make
existing code of dbname optional actually work.
Diffstat (limited to 'src/bin/scripts/createlang.sh')
| -rw-r--r-- | src/bin/scripts/createlang.sh | 36 |
1 files changed, 17 insertions, 19 deletions
diff --git a/src/bin/scripts/createlang.sh b/src/bin/scripts/createlang.sh index 121fa8cde1a..881257157bc 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.31 2001/09/30 22:17:51 momjian Exp $ +# $Header: /cvsroot/pgsql/src/bin/scripts/Attic/createlang.sh,v 1.32 2002/01/03 05:30:04 momjian Exp $ # #------------------------------------------------------------------------- @@ -125,7 +125,7 @@ if [ -n "$usage" ]; then echo "$CMDNAME installs a procedural language into a PostgreSQL database." echo echo "Usage:" - echo " $CMDNAME [options] [langname] dbname" + echo " $CMDNAME [options] langname [dbname]" echo echo "Options:" echo " -h, --host=HOSTNAME Database server host" @@ -136,26 +136,23 @@ if [ -n "$usage" ]; then echo " -L, --pglib=DIRECTORY Find language interpreter file in DIRECTORY" echo " -l, --list Show a list of currently installed languages" echo - echo "If 'langname' is not specified, you will be prompted interactively." - echo "A database name must be specified." - echo echo "Report bugs to <pgsql-bugs@postgresql.org>." exit 0 fi -# ---------- -# Check that we have a database -# ---------- if [ -z "$dbname" ]; then - echo "$CMDNAME: missing required argument database name" 1>&2 - echo "Try '$CMDNAME --help' for help." 1>&2 - exit 1 + if [ "$PGUSER" ]; then + dbname="$PGUSER" + else + dbname=`${PATHNAME}pg_id -u -n` + fi + [ "$?" -ne 0 ] && exit 1 fi # ---------- -# List option +# List option, doesn't need langname # ---------- if [ "$list" ]; then sqlcmd="SELECT lanname as \"Name\", lanpltrusted as \"Trusted?\" FROM pg_language WHERE lanispl = TRUE;" @@ -168,18 +165,19 @@ fi # ---------- -# Check that we have PGLIB +# We can't go any farther without a langname # ---------- -if [ -z "$PGLIB" ]; then - PGLIB='$libdir' +if [ -z "$langname" ]; then + echo "$CMDNAME: missing required argument language name" 1>&2 + echo "Try '$CMDNAME --help' for help." 1>&2 + exit 1 fi # ---------- -# If not given on the command line, ask for the language +# Check that we have PGLIB # ---------- -if [ -z "$langname" ]; then - $ECHO_N "Language to install in database $dbname: "$ECHO_C - read langname +if [ -z "$PGLIB" ]; then + PGLIB='$libdir' fi # ---------- |