diff --git a/src/bin/initdb/initdb.sh b/src/bin/initdb/initdb.sh index 343a0c27d7..dc500a6e70 100644 --- a/src/bin/initdb/initdb.sh +++ b/src/bin/initdb/initdb.sh @@ -23,7 +23,7 @@ # # Copyright (c) 1994, Regents of the University of California # -# $Header: /cvsroot/pgsql/src/bin/initdb/Attic/initdb.sh,v 1.112 2000/11/09 11:26:00 vadim Exp $ +# $Header: /cvsroot/pgsql/src/bin/initdb/Attic/initdb.sh,v 1.113 2000/11/11 22:59:46 petere Exp $ # #------------------------------------------------------------------------- @@ -34,17 +34,17 @@ exit_nicely(){ stty echo > /dev/null 2>&1 - echo - echo "$CMDNAME failed." + echo 1>&2 + echo "$CMDNAME failed." 1>&2 if [ "$noclean" != yes ]; then if [ "$template_only" != yes ] && [ "$made_new_pgdata" = yes ]; then - echo "Removing $PGDATA." - rm -rf "$PGDATA" || echo "Failed." + echo "Removing $PGDATA." 1>&2 + rm -rf "$PGDATA" || echo "Failed." 1>&2 fi - echo "Removing temp file $TEMPFILE." - rm -rf "$TEMPFILE" || echo "Failed." + echo "Removing temp file $TEMPFILE." 1>&2 + rm -rf "$TEMPFILE" || echo "Failed." 1>&2 else - echo "Data directory $PGDATA will not be removed at user's request." + echo "Data directory $PGDATA will not be removed at user's request." 1>&2 fi exit 1 } @@ -117,13 +117,13 @@ elif [ -x "$bindir/postgres" ]; then then PGPATH=$bindir else - echo "The program '$bindir/postgres' needed by $CMDNAME does not belong to" - echo "PostgreSQL version $VERSION. Check your installation." + echo "The program '$bindir/postgres' needed by $CMDNAME does not belong to" 1>&2 + echo "PostgreSQL version $VERSION. Check your installation." 1>&2 exit 1 fi else - echo "The program 'postgres' is needed by $CMDNAME but was not found in" - echo "the directory '$bindir'. Check your installation." + echo "The program 'postgres' is needed by $CMDNAME but was not found in" 1>&2 + echo "the directory '$bindir'. Check your installation." 1>&2 exit 1 fi @@ -131,29 +131,29 @@ fi # Now we can assume that 'pg_id' belongs to the same version as the # verified 'postgres' in the same directory. if [ ! -x "$PGPATH/pg_id" ]; then - echo "The program 'pg_id' is needed by $CMDNAME but was not found in" - echo "the directory '$PGPATH'. Check your installation." + echo "The program 'pg_id' is needed by $CMDNAME but was not found in" 1>&2 + echo "the directory '$PGPATH'. Check your installation." 1>&2 exit 1 fi EffectiveUser=`$PGPATH/pg_id -n -u` if [ -z "$EffectiveUser" ]; then - echo "$CMDNAME: could not determine current user name" + echo "$CMDNAME: could not determine current user name" 1>&2 exit 1 fi if [ `$PGPATH/pg_id -u` -eq 0 ] then - echo "You cannot run $CMDNAME as root. Please log in (using, e.g., 'su')" - echo "as the (unprivileged) user that will own the server process." + echo "You cannot run $CMDNAME as root. Please log in (using, e.g., 'su')" 1>&2 + echo "as the (unprivileged) user that will own the server process." 1>&2 exit 1 fi short_version=`echo $VERSION | sed -e 's!^\([0-9][0-9]*\.[0-9][0-9]*\).*!\1!'` if [ x"$short_version" = x"" ] ; then - echo "$CMDNAME: bug: version number is out of format" + echo "$CMDNAME: bug: version number has wrong format" 1>&2 exit 1 fi @@ -252,7 +252,7 @@ do ;; -*) echo "$CMDNAME: invalid option: $1" - echo "Try -? for help." + echo "Try '$CMDNAME -?' for help." exit 1 ;; *) @@ -263,20 +263,20 @@ do done if [ "$usage" ]; then - echo "$CMDNAME initialized a PostgreSQL database cluster." + echo "$CMDNAME initializes a PostgreSQL database cluster." echo echo "Usage:" echo " $CMDNAME [options] datadir" echo echo "Options:" - echo " [-D, --pgdata] Location for this database cluster" + echo " [-D, --pgdata] DATADIR Location for this database cluster" echo " -W, --pwprompt Prompt for a password for the new superuser" if [ -n "$MULTIBYTE" ] ; then - echo " -E, --encoding Set the default multibyte encoding for new databases" + echo " -E, --encoding ENCODING Set the default multibyte encoding for new databases" fi - echo " -i, --sysid Database sysid for the superuser" + echo " -i, --sysid SYSID Database sysid for the superuser" echo "Less commonly used options: " - echo " -L Where to find the input files" + echo " -L DIRECTORY Where to find the input files" echo " -t, --template Re-initialize template database only" echo " -d, --debug Generate lots of debugging output" echo " -n, --noclean Do not clean up after errors" @@ -294,15 +294,17 @@ then MULTIBYTEID=`$PGPATH/pg_encoding $MULTIBYTE` if [ "$?" -ne 0 ] then + ( echo "$CMDNAME: pg_encoding failed" echo echo "Perhaps you did not configure PostgreSQL for multibyte support or" echo "the program was not successfully installed." + ) 1>&2 exit 1 fi if [ -z "$MULTIBYTEID" ] then - echo "$CMDNAME: $MULTIBYTE is not a valid encoding name" + echo "$CMDNAME: $MULTIBYTE is not a valid encoding name" 1>&2 exit 1 fi fi @@ -314,10 +316,11 @@ fi if [ -z "$PGDATA" ] then + ( echo "$CMDNAME: You must identify where the the data for this database" echo "system will reside. Do this with either a -D invocation" echo "option or a PGDATA environment variable." - echo + ) 1>&2 exit 1 fi @@ -353,18 +356,22 @@ fi for PREREQ_FILE in "$TEMPLATE1_BKI" "$GLOBAL_BKI" "$PG_HBA_SAMPLE" do if [ ! -f "$PREREQ_FILE" ] ; then + ( echo "$CMDNAME does not find the file '$PREREQ_FILE'." echo "This means you have a corrupted installation or identified the" echo "wrong directory with the -L invocation option." + ) 1>&2 exit 1 fi done for file in "$TEMPLATE1_BKI" "$GLOBAL_BKI"; do if [ x"`sed 1q $file`" != x"# PostgreSQL $short_version" ]; then + ( echo "The input file '$file' needed by $CMDNAME does not" echo "belong to PostgreSQL $VERSION. Check your installation or specify the" echo "correct path using the -L option." + ) 1>&2 exit 1 fi done @@ -391,10 +398,12 @@ if [ x"$pgdata_contents" != x ] then if [ "$template_only" != yes ] then + ( echo "$CMDNAME: The directory $PGDATA is exists but is not empty." echo "If you want to create a new database system, either remove or empty" echo "the directory $PGDATA or run initdb with an argument" echo "other than $PGDATA." + ) 1>&2 exit 1 fi else @@ -509,13 +518,13 @@ if [ "$PwPrompt" ]; then stty echo > /dev/null 2>&1 echo if [ "$FirstPw" != "$SecondPw" ]; then - echo "Passwords didn't match." + echo "Passwords didn't match." 1>&2 exit_nicely fi echo "ALTER USER \"$POSTGRES_SUPERUSERNAME\" WITH PASSWORD '$FirstPw'" \ | "$PGPATH"/postgres $PGSQL_OPT template1 > /dev/null || exit_nicely if [ ! -f $PGDATA/pg_pwd ]; then - echo "The password file wasn't generated. Please report this problem." + echo "The password file wasn't generated. Please report this problem." 1>&2 exit_nicely fi echo "Setting password" diff --git a/src/bin/initlocation/initlocation.sh b/src/bin/initlocation/initlocation.sh index b5700e2f6b..df8abda1f4 100644 --- a/src/bin/initlocation/initlocation.sh +++ b/src/bin/initlocation/initlocation.sh @@ -8,7 +8,7 @@ # # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/bin/initlocation/Attic/initlocation.sh,v 1.8 2000/05/26 03:15:18 momjian Exp $ +# $Header: /cvsroot/pgsql/src/bin/initlocation/Attic/initlocation.sh,v 1.9 2000/11/11 22:59:46 petere Exp $ # #------------------------------------------------------------------------- @@ -50,8 +50,8 @@ do break;; -*) - echo "$CMDNAME: unrecognized option $badparm" - echo "Try -? for help." + echo "$CMDNAME: invalid option: $1" 1>&2 + echo "Try '$CMDNAME -?' for help." 1>&2 exit 1 ;; *) @@ -66,16 +66,18 @@ if [ "$usage" ]; then echo "$CMDNAME initializes an alternative filesystem location for database creation." echo "" echo "Usage:" - echo " $CMDNAME " - echo "" + echo " $CMDNAME LOCATION" + echo + echo "Please read the description of the CREATE DATABASE command for details." + echo echo "Report bugs to ." exit 0 fi if [ -z "$Location" ]; then - echo "$CMDNAME: missing required argument " - echo "Try -? for help." + echo "$CMDNAME: missing required argument LOCATION" 1>&2 + echo "Try '$CMDNAME -?' for help." 1>&2 exit 1 fi @@ -99,7 +101,7 @@ echo "$Location" | grep '/' >/dev/null 2>&1 if [ "$?" -ne 0 -a ! -d "$Location" ]; then PGALTDATA=`printenv $Location 2> /dev/null` if [ -z "$PGALTDATA" ]; then - echo "$CMDNAME: environment variable $Location not set" + echo "$CMDNAME: environment variable $Location not set" 1>&2 exit 1 fi haveenv=t @@ -126,8 +128,8 @@ if [ ! -d $PGALTDATA ]; then echo "Creating directory $PGALTDATA" mkdir "$PGALTDATA" if [ $? -ne 0 ]; then - echo "$CMDNAME: could not create $PGALTDATA" - echo "Make sure $PGALTDATA is a valid path and that you have permission to access it." + 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 fi else @@ -140,8 +142,8 @@ if [ ! -d $PGALTDATA/base ]; then echo "Creating directory $PGALTDATA/base" mkdir "$PGALTDATA/base" if [ $? -ne 0 ]; then - echo "$CMDNAME: could not create $PGALTDATA/base" - echo "Make sure $PGALTDATA/base is a valid path and that you have permission to access it." + 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 fi else diff --git a/src/bin/ipcclean/ipcclean.sh b/src/bin/ipcclean/ipcclean.sh index 699c90e951..d4572dd77b 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.5 2000/03/25 14:44:41 momjian Exp $ +# $Header: /cvsroot/pgsql/src/bin/ipcclean/Attic/ipcclean.sh,v 1.6 2000/11/11 22:59:47 petere Exp $ # CMDNAME=`basename $0` @@ -20,8 +20,10 @@ fi if [ "$USER" = 'root' -o "$LOGNAME" = 'root' ] then + ( echo "You cannot run $CMDNAME as root. Please log in (using, e.g., 'su')" echo "as the (unprivileged) user that owned the server process." + ) 1>&2 exit 1 fi @@ -42,7 +44,7 @@ if [ `uname` = 'Linux' ]; then did_anything= if ps x | grep -s 'postmaster' >/dev/null 2>&1 ; then - echo "$CMDNAME: You still have a postmaster running." + echo "$CMDNAME: You still have a postmaster running." 1>&2 exit 1 fi diff --git a/src/bin/pg_config/pg_config.sh b/src/bin/pg_config/pg_config.sh index 6e5f18cfc0..2249717d9a 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.1 2000/10/10 22:01:55 momjian Exp $ +# $Header: /cvsroot/pgsql/src/bin/pg_config/Attic/pg_config.sh,v 1.2 2000/11/11 22:59:47 petere Exp $ me=`basename $0` @@ -27,18 +27,18 @@ Operation modes: --bindir show location of user executables --includedir show location of C header files --libdir show location of object code libraries - --configure show options given to \`configure' script when + --configure show options given to 'configure' script when PostgreSQL was built --version show PostgreSQL version and exit Report bugs to ." advice="\ -Try \`$me --help' for more information." +Try '$me --help' for more information." if test $# -eq 0 ; then - echo "$me: argument required" - echo "$advice" + echo "$me: argument required" 1>&2 + echo "$advice" 1>&2 exit 1 fi @@ -56,8 +56,8 @@ do exit 0;; --help|-\?) echo "$help" exit 0;; - *) echo "$me: invalid argument: $opt" - echo "$advice" + *) echo "$me: invalid argument: $opt" 1>&2 + echo "$advice" 1>&2 exit 1;; esac done diff --git a/src/bin/scripts/createdb b/src/bin/scripts/createdb index fd07e27292..3601811b24 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.8 2000/02/10 20:08:58 petere Exp $ +# $Header: /cvsroot/pgsql/src/bin/scripts/Attic/createdb,v 1.9 2000/11/11 22:59:48 petere Exp $ # #------------------------------------------------------------------------- @@ -88,8 +88,8 @@ do MB=`echo $1 | sed 's/^--encoding=//'` ;; -*) - echo "$CMDNAME: invalid option: $1" - echo "Try -? for help." + echo "$CMDNAME: invalid option: $1" 1>&2 + echo "Try '$CMDNAME -?' for help." 1>&2 exit 1 ;; *) @@ -118,6 +118,8 @@ if [ "$usage" ]; then echo " -W, --password Prompt for password" echo " -e, --echo Show the query being sent to the backend" echo " -q, --quiet Don't write any messages" + echo + echo "By default, a database with the same name as the current user is created." echo echo "Report bugs to ." exit 0 @@ -129,7 +131,7 @@ then mbcode=`${PATHNAME}pg_encoding "$MB"` if [ -z "$mbcode" ] then - echo "$CMDNAME: \"$MB\" is not a valid encoding name" + echo "$CMDNAME: \"$MB\" is not a valid encoding name" 1>&2 exit 1 fi fi @@ -155,7 +157,7 @@ withstring= ${PATHNAME}psql $PSQLOPT -d template1 -c "CREATE DATABASE \"$dbname\"$withstring" if [ $? -ne 0 ]; then - echo "$CMDNAME: database creation failed" + echo "$CMDNAME: database creation failed" 1>&2 exit 1 fi @@ -166,7 +168,7 @@ 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)" + 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 145c83f2f5..4275dc6e93 100644 --- a/src/bin/scripts/createlang.sh +++ b/src/bin/scripts/createlang.sh @@ -8,7 +8,7 @@ # # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/bin/scripts/Attic/createlang.sh,v 1.16 2000/09/29 17:17:34 petere Exp $ +# $Header: /cvsroot/pgsql/src/bin/scripts/Attic/createlang.sh,v 1.17 2000/11/11 22:59:48 petere Exp $ # #------------------------------------------------------------------------- @@ -98,8 +98,8 @@ do ;; -*) - echo "$CMDNAME: invalid option: $1" - echo "Try -? for help." + echo "$CMDNAME: invalid option: $1" 1>&2 + echo "Try '$CMDNAME -?' for help." 1>&2 exit 1 ;; *) @@ -121,7 +121,7 @@ if [ "$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" @@ -132,6 +132,9 @@ if [ "$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 ." exit 0 fi @@ -141,8 +144,8 @@ fi # Check that we have a database # ---------- if [ -z "$dbname" ]; then - echo "$CMDNAME: missing required argument database name" - echo "Try -? for help." + echo "$CMDNAME: missing required argument database name" 1>&2 + echo "Try '$CMDNAME -?' for help." 1>&2 exit 1 fi @@ -200,8 +203,8 @@ case "$langname" in object="plperl" ;; *) - echo "$CMDNAME: unsupported language '$langname'" - echo "Supported languages are 'plpgsql', 'pltcl', and 'plperl'." + echo "$CMDNAME: unsupported language '$langname'" 1>&2 + echo "Supported languages are 'plpgsql', 'pltcl', 'pltclu', and 'plperl'." 1>&2 exit 1 ;; esac @@ -213,14 +216,17 @@ DLSUFFIX='@DLSUFFIX@' # in PGLIB # ---------- if [ ! -f "$PGLIB/$object$DLSUFFIX" ]; then - echo "$CMDNAME: cannot find the file \`$PGLIB/$langname$DLSUFFIX'" + ( + echo "$CMDNAME: cannot find the file '$PGLIB/$langname$DLSUFFIX'" echo "" - echo "This file contains the call handler for $lancomp. By default," + echo "This file contains the call handler for $lancomp. By default," echo "only PL/pgSQL is built and installed; other languages must be" echo "explicitly enabled at configure time." echo "" echo "To install PL/Tcl, make sure the option --with-tcl is given to" - echo "configure, then recompile and install." + echo "configure, then recompile and install. To install PL/Perl use" + echo "--with-perl." + ) 1>&2 exit 1 fi @@ -232,11 +238,11 @@ PSQL="${PATHNAME}psql -A -t -q $PSQLOPT -d $dbname -c" # ---------- res=`$PSQL "SELECT oid FROM pg_language WHERE lanname = '$langname'"` if [ $? -ne 0 ]; then - echo "$CMDNAME: external error" + echo "$CMDNAME: external error" 1>&2 exit 1 fi if [ "$res" ]; then - echo "$CMDNAME: '$langname' is already installed in database $dbname" + echo "$CMDNAME: '$langname' is already installed in database $dbname" 1>&2 # separate exit status for "already installed" exit 2 fi @@ -246,7 +252,7 @@ fi # ---------- res=`$PSQL "SELECT oid FROM pg_proc WHERE proname = '$handler'"` if [ ! -z "$res" ]; then - echo "$CMDNAME: A function named '$handler' already exists. Installation aborted." + echo "$CMDNAME: A function named '$handler' already exists. Installation aborted." 1>&2 exit 1 fi @@ -255,13 +261,13 @@ fi # ---------- $PSQL "CREATE FUNCTION $handler () RETURNS OPAQUE AS '$PGLIB/${object}$DLSUFFIX' LANGUAGE 'newC'" if [ $? -ne 0 ]; then - echo "$CMDNAME: language installation failed" + echo "$CMDNAME: language installation failed" 1>&2 exit 1 fi $PSQL "CREATE ${trusted}PROCEDURAL LANGUAGE '$langname' HANDLER $handler LANCOMPILER '$lancomp'" if [ $? -ne 0 ]; then - echo "$CMDNAME: language installation failed" + echo "$CMDNAME: language installation failed" 1>&2 exit 1 fi diff --git a/src/bin/scripts/createuser b/src/bin/scripts/createuser index cba8cd2028..62c674d99e 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.11 2000/06/12 03:40:49 momjian Exp $ +# $Header: /cvsroot/pgsql/src/bin/scripts/Attic/createuser,v 1.12 2000/11/11 22:59:48 petere Exp $ # # Note - this should NOT be setuid. # @@ -109,8 +109,8 @@ do PwPrompt=t ;; -*) - echo "$CMDNAME: invalid option: $1" - echo "Try -? for help." + echo "$CMDNAME: invalid option: $1" 1>&2 + echo "Try '$CMDNAME -?' for help." 1>&2 exit 1 ;; *) @@ -140,13 +140,16 @@ if [ "$usage" ]; then echo " -e, --echo Show the query being sent to the backend" echo " -q, --quiet Don't write any messages" echo + echo "If one of -d, -D, -a, -A, and 'username' is not specified, you will" + echo "be prompted interactively." + echo echo "Report bugs to ." exit 0 fi if [ "$SysID" ]; then if [ "$SysID" != "`echo $SysID | sed 's/[^0-9]//g'`" ]; then - echo "$CMDNAME: user sysid must be a positive number" + echo "$CMDNAME: user sysid must be a positive number" 1>&2 exit 1 fi fi @@ -176,7 +179,7 @@ if [ "$PwPrompt" ]; then stty echo >/dev/null 2>&1 echo if [ "$FirstPw" != "$SecondPw" ]; then - echo "Passwords didn't match." + echo "Passwords didn't match." 1>&2 exit 1 fi Password=$FirstPw @@ -225,7 +228,7 @@ SUBQUERY= ${PATHNAME}psql -c "$QUERY" -d template1 $PSQLOPT if [ $? -ne 0 ]; then - echo "$CMDNAME: creation of user \"$NewUser\" failed" + 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 65c8542e89..1bb6f10f25 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.6 2000/01/19 20:08:36 petere Exp $ +# $Header: /cvsroot/pgsql/src/bin/scripts/Attic/dropdb,v 1.7 2000/11/11 22:59:48 petere Exp $ # #------------------------------------------------------------------------- @@ -82,8 +82,8 @@ do forcedel=f ;; -*) - echo "$CMDNAME: invalid option: $1" - echo "Try -? for help." + echo "$CMDNAME: invalid option: $1" 1>&2 + echo "Try '$CMDNAME -?' for help." 1>&2 exit 1 ;; *) @@ -114,8 +114,8 @@ if [ "$usage" ]; then fi if [ -z "$dbname" ]; then - echo "$CMDNAME: missing required argument database name" - echo "Try -? for help." + echo "$CMDNAME: missing required argument database name" 1>&2 + echo "Try '$CMDNAME -?' for help." 1>&2 exit 1 fi @@ -134,7 +134,7 @@ dbname=`echo $dbname | sed 's/\"/\\\"/g'` ${PATHNAME}psql $PSQLOPT -d template1 -c "DROP DATABASE \"$dbname\"" if [ $? -ne 0 ]; then - echo "$CMDNAME: database removal failed" + echo "$CMDNAME: database removal failed" 1>&2 exit 1 fi diff --git a/src/bin/scripts/droplang b/src/bin/scripts/droplang index ece2c5c25d..3205ad3577 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.7 2000/02/09 20:23:26 momjian Exp $ +# $Header: /cvsroot/pgsql/src/bin/scripts/Attic/droplang,v 1.8 2000/11/11 22:59:48 petere Exp $ # #------------------------------------------------------------------------- @@ -88,8 +88,8 @@ do ;; -*) - echo "$CMDNAME: invalid option: $1" - echo "Try -? for help." + echo "$CMDNAME: invalid option: $1" 1>&2 + echo "Try '$CMDNAME -?' for help." 1>&2 exit 1 ;; *) @@ -118,6 +118,9 @@ if [ "$usage" ]; then echo " -d, --dbname=DBNAME Database to remove language from" 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 ." exit 0 fi @@ -133,8 +136,8 @@ fi # Check that we have a database # ---------- if [ -z "$dbname" ]; then - echo "$CMDNAME: missing required argument database name" - echo "Try -? for help." + echo "$CMDNAME: missing required argument database name" 1>&2 + echo "Try '$CMDNAME -?' for help." 1>&2 exit 1 fi @@ -159,13 +162,17 @@ case "$langname" in lancomp="PL/Tcl" handler="pltcl_call_handler" ;; + pltclu) + lancomp="PL/Tcl (untrusted)" + handler="pltclu_call_handler" + ;; plperl) lancomp="PL/Perl" handler="plperl_call_handler" ;; *) - echo "$CMDNAME: unsupported language '$langname'" - echo "Supported languages are 'plpgsql', 'pltcl', and 'plperl'." + echo "$CMDNAME: unsupported language '$langname'" 1>&2 + echo "Supported languages are 'plpgsql', 'pltcl', 'pltclu', and 'plperl'." 1>&2 exit 1 ;; esac @@ -179,11 +186,11 @@ PSQL="${PATHNAME}psql -A -t -q $PSQLOPT -d $dbname -c" # ---------- res=`$PSQL "SELECT oid FROM pg_language WHERE lanname = '$langname'"` if [ $? -ne 0 ]; then - echo "$CMDNAME: external error" + echo "$CMDNAME: external error" 1>&2 exit 1 fi if [ -z "$res" ]; then - echo "$CMDNAME: '$langname' is not installed in database $dbname" + echo "$CMDNAME: '$langname' is not installed in database $dbname" 1>&2 exit 1 fi @@ -193,12 +200,12 @@ fi # ---------- res=`$PSQL "SELECT COUNT(proname) FROM pg_proc P, pg_language L WHERE P.prolang = L.oid AND L.lanname = '$langname'"` if [ $? -ne 0 ]; then - echo "$CMDNAME: external error" + 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" - echo "$lancomp. Language not removed." + echo "$CMDNAME: There are $res functions/trigger procedures declared in language" 1>&2 + echo "$lancomp. Language not removed." 1>&2 exit 1 fi @@ -207,14 +214,13 @@ fi # ---------- $PSQL "DROP PROCEDURAL LANGUAGE '$langname'" if [ $? -ne 0 ]; then - echo "$CMDNAME: language removal failed" + echo "$CMDNAME: language removal failed" 1>&2 exit 1 fi $PSQL "DROP FUNCTION $handler()" if [ $? -ne 0 ]; then - echo "$CMDNAME: language removal failed" + echo "$CMDNAME: language removal failed" 1>&2 exit 1 fi -echo "Ok" exit 0 diff --git a/src/bin/scripts/dropuser b/src/bin/scripts/dropuser index 3a33c1f9cd..81a00f9c1c 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.6 2000/01/19 20:08:36 petere Exp $ +# $Header: /cvsroot/pgsql/src/bin/scripts/Attic/dropuser,v 1.7 2000/11/11 22:59:48 petere Exp $ # # Note - this should NOT be setuid. # @@ -84,8 +84,8 @@ do forcedel=f ;; -*) - echo "$CMDNAME: invalid option: $1" - echo "Try -? for help." + echo "$CMDNAME: invalid option: $1" 1>&2 + echo "Try '$CMDNAME -?' for help." 1>&2 exit 1 ;; *) @@ -139,7 +139,7 @@ DelUser=`echo $DelUser | sed 's/\"/\\\"/g'` ${PATHNAME}psql $PSQLOPT -d template1 -c "DROP USER \"$DelUser\"" if [ $? -ne 0 ]; then - echo "$CMDNAME: deletion of user \"$DelUser\" failed" + 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 fcf6d4513c..af038add8a 100644 --- a/src/bin/scripts/vacuumdb +++ b/src/bin/scripts/vacuumdb @@ -11,7 +11,7 @@ # # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/bin/scripts/Attic/vacuumdb,v 1.9 2000/01/19 20:08:36 petere Exp $ +# $Header: /cvsroot/pgsql/src/bin/scripts/Attic/vacuumdb,v 1.10 2000/11/11 22:59:48 petere Exp $ # #------------------------------------------------------------------------- @@ -101,8 +101,8 @@ do ;; -*) - echo "$CMDNAME: invalid option: $1" - echo "Try -? for help." + echo "$CMDNAME: invalid option: $1" 1>&2 + echo "Try '$CMDNAME -?' for help." 1>&2 exit 1 ;; *) @@ -131,20 +131,22 @@ if [ "$usage" ]; then echo " -e, --echo Show the command being sent to the backend" echo " -q, --quiet Don't write any output" echo + echo "Read the description of the SQL command VACUUM for details." + echo echo "Report bugs to ." exit 0 fi if [ "$alldb" ]; then if [ "$dbname" -o "$table" ]; then - echo "$CMDNAME: cannot vacuum all databases and a specific one at the same time" + echo "$CMDNAME: cannot vacuum all databases and a specific one at the same time" 1>&2 exit 1 fi dbname=`${PATHNAME}psql $PSQLOPT -q -t -A -d template1 -c 'SELECT datname FROM pg_database'` elif [ -z "$dbname" ]; then - echo "$CMDNAME: missing required argument database name" - echo "Try -? for help." + echo "$CMDNAME: missing required argument database name" 1>&2 + echo "Try '$CMDNAME -?' for help." 1>&2 exit 1 fi @@ -155,7 +157,7 @@ do done if [ $? -ne 0 ]; then - echo "$CMDNAME: vacuum failed" + echo "$CMDNAME: vacuum failed" 1>&2 exit 1 fi