diff options
Diffstat (limited to 'src/bin/scripts')
-rw-r--r-- | src/bin/scripts/createdb | 21 | ||||
-rw-r--r-- | src/bin/scripts/createlang.sh | 25 | ||||
-rw-r--r-- | src/bin/scripts/createuser | 29 | ||||
-rw-r--r-- | src/bin/scripts/dropdb | 17 | ||||
-rw-r--r-- | src/bin/scripts/droplang | 19 | ||||
-rw-r--r-- | src/bin/scripts/dropuser | 20 | ||||
-rw-r--r-- | src/bin/scripts/vacuumdb | 25 |
7 files changed, 113 insertions, 43 deletions
diff --git a/src/bin/scripts/createdb b/src/bin/scripts/createdb index 800d560cc03..14aad8b890e 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.3 1999/12/08 10:29:55 momjian Exp $ +# $Header: /cvsroot/pgsql/src/bin/scripts/Attic/createdb,v 1.4 1999/12/16 20:10:02 momjian Exp $ # #------------------------------------------------------------------------- @@ -28,7 +28,6 @@ do case "$1" in --help|-\?) usage=t - break ;; # options passed on to psql --host|-h) @@ -104,11 +103,21 @@ do shift done - if [ "$usage" ]; then - echo "Usage: $CMDNAME [-h server] [-p port] [-D path] \\" - echo " [-E encoding] [-U username] dbname [description]" - exit 0 + echo "" + echo "Usage: $CMDNAME [options] dbname [description]" + echo "" + echo " -h HOSTNAME, --host=HOSTNAME " + echo " -p PORT, --port=PORT " + echo " -U USERNAME, --username=USERNAME " + echo " -W, --password " + echo " -e, --echo " + echo " -q, --quiet " + echo " -D PATH, --location=PATH " + echo " -E ENCODING --encoding=ENCODING " + echo " -?, --help " + echo "" + exit 1 fi diff --git a/src/bin/scripts/createlang.sh b/src/bin/scripts/createlang.sh index 2b39eaa7125..18c7c1baa71 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.2 1999/12/07 22:41:44 momjian Exp $ +# $Header: /cvsroot/pgsql/src/bin/scripts/Attic/createlang.sh,v 1.3 1999/12/16 20:10:02 momjian Exp $ # #------------------------------------------------------------------------- @@ -51,7 +51,6 @@ do case "$1" in --help|-\?) usage=t - break ;; --list|-l) list=t @@ -127,12 +126,22 @@ do shift done - - -if [ "$usage" ]; then - echo "Usage: $CMDNAME [-h server] [-p port] [-U username] [-d dbname] \\" - echo " [-L|--pglib PGLIB] [langname [dbname]]" - exit 0 +if [ "$usage" ]; then + echo "" + echo "Usage: $CMDNAME [options] [langname [dbname]]" + echo "" + echo " -h HOSTNAME, --host=HOSTNAME " + echo " -p PORT, --port=PORT " + echo " -U USERNAME, --username=USERNAME " + echo " -W, --password " + echo " -d DBNAME, --database=DBNAME " + echo " -e, --echo " + echo " -q, --quiet " + echo " -D PATH, --location=PATH " + echo " -L PGLIB --pglib=PGLIB " + echo " -?, --help " + echo "" + exit 1 fi if [ "$list" ]; then diff --git a/src/bin/scripts/createuser b/src/bin/scripts/createuser index 8eb9d55456e..ae4f3dff321 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.3 1999/12/07 22:41:44 momjian Exp $ +# $Header: /cvsroot/pgsql/src/bin/scripts/Attic/createuser,v 1.4 1999/12/16 20:10:02 momjian Exp $ # # Note - this should NOT be setuid. # @@ -41,7 +41,6 @@ do case "$1" in --help|-\?) usage=t - break ;; # options passed on to psql --host|-h) @@ -121,15 +120,27 @@ do shift; done - -# Help - -if [ "$usage" ]; then - echo "Usage: $CMDNAME [-h server] [-p port] [-d|-D] [-a|-A] [-P] [-i id] [username]" - exit 0 +if [ "$usage" ]; then + echo "" + echo "Usage: $CMDNAME [options] [username]" + echo "" + echo " -h HOSTNAME, --host=HOSTNAME " + echo " -p PORT, --port=PORT " + echo " -d, --createdb " + echo " -D, --no-createdb " + echo " -a, --adduser " + echo " -A, --no-adduser " + echo " -i SYSID, --sysid=SYSID " + echo " -P, --pwprompt " + echo " -U USERNAME, --username=USERNAME (for connect to db)" + echo " -W, --password (for connect to db)" + echo " -e, --echo " + echo " -q, --quiet " + echo " -?, --help " + echo "" + exit 1 fi - if [ "$SysID" ]; then if [ "$SysID" != "`echo $SysID | sed 's/[^0-9]//g'`" ]; then echo "$CMDNAME: User sysid must be a positive number." diff --git a/src/bin/scripts/dropdb b/src/bin/scripts/dropdb index 8ef22fce84d..58b4076ebb9 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.3 1999/12/07 22:41:44 momjian Exp $ +# $Header: /cvsroot/pgsql/src/bin/scripts/Attic/dropdb,v 1.4 1999/12/16 20:10:02 momjian Exp $ # #------------------------------------------------------------------------- @@ -96,8 +96,19 @@ done if [ "$usage" ]; then - echo "Usage: $CMDNAME [-h server] [-p port] [-U username] [-i] dbname" - exit 0 + echo "" + echo "Usage: $CMDNAME [options] dbname" + echo "" + echo " -h HOSTNAME, --host=HOSTNAME " + echo " -p PORT, --port=PORT " + echo " -u USERNAME, --username=USERNAME " + echo " -W, --password " + echo " -e, --echo " + echo " -q, --quiet " + echo " -i, --interactive " + echo " -?, --help " + echo "" + exit 1 fi if [ -z "$dbname" ]; then diff --git a/src/bin/scripts/droplang b/src/bin/scripts/droplang index 2ff0ddf30ea..8fbfd3b9ec0 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.3 1999/12/07 22:41:44 momjian Exp $ +# $Header: /cvsroot/pgsql/src/bin/scripts/Attic/droplang,v 1.4 1999/12/16 20:10:02 momjian Exp $ # #------------------------------------------------------------------------- @@ -40,7 +40,6 @@ do case "$1" in --help|-\?) usage=t - break ;; --list|-l) list=t @@ -108,10 +107,22 @@ done if [ "$usage" ]; then - echo "Usage: $CMDNAME [-h server] [-p port] [-U username] [-d dbname] [langname [dbname]]" - exit 0 + echo "" + echo "Usage: $CMDNAME [options] [language [dbname]]" + echo "" + echo " -h HOSTNAME, --host=HOSTNAME " + echo " -p PORT, --port=PORT " + echo " -u USERNAME, --username=USERNAME " + echo " -W, --password " + echo " -d DBNAME --database=DBNAME " + echo " -e, --echo " + echo " -q, --quiet " + echo " -?, --help " + echo "" + exit 1 fi + if [ "$list" ]; then psql $PSQLOPT -d "$dbname" -c "SELECT lanname, lanpltrusted, lancompiler FROM pg_language WHERE lanispl = 't'" exit $? diff --git a/src/bin/scripts/dropuser b/src/bin/scripts/dropuser index bec2d9bb218..a5d743eadcd 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.3 1999/12/07 22:41:44 momjian Exp $ +# $Header: /cvsroot/pgsql/src/bin/scripts/Attic/dropuser,v 1.4 1999/12/16 20:10:02 momjian Exp $ # # Note - this should NOT be setuid. # @@ -36,7 +36,6 @@ do case "$1" in --help|-\?) usage=t - break ;; # options passed on to psql --host|-h) @@ -96,11 +95,20 @@ do done -# Help - if [ "$usage" ]; then - echo "Usage: $CMDNAME [-h server] [-p port] [-i] [username]" - exit 0 + echo "" + echo "Usage: $CMDNAME [options] [username]" + echo "" + echo " -h HOSTNAME, --host=HOSTNAME " + echo " -p PORT, --port=PORT " + echo " -u USERNAME, --username=USERNAME (for connect to db)" + echo " -W, --password " + echo " -e, --echo " + echo " -q, --quiet " + echo " -i, --interactive " + echo " -?, --help " + echo "" + exit 1 fi # Prompt for username if missing diff --git a/src/bin/scripts/vacuumdb b/src/bin/scripts/vacuumdb index 4998aa44cf0..487a2c4feea 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.3 1999/12/07 22:41:44 momjian Exp $ +# $Header: /cvsroot/pgsql/src/bin/scripts/Attic/vacuumdb,v 1.4 1999/12/16 20:10:02 momjian Exp $ # #------------------------------------------------------------------------- @@ -28,7 +28,6 @@ do case "$1" in --help|-\?) usage=t - break ;; # options passed on to psql --host|-h) @@ -110,11 +109,23 @@ do shift done - -if [ "$usage" ]; then - echo "Usage: $CMDNAME [-h server] [-p port] [-U username] [-d dbname] \\" - echo " [-z|--analyze] [-v|--verbose] [-t|--table 'table[(columns)]'] [dbname]" - exit 0 +if [ "$usage" ]; then + echo "" + echo "Usage: $CMDNAME [options] [dbname]" + echo "" + echo " -h HOSTNAME, --host=HOSTNAME " + echo " -p PORT, --port=PORT " + echo " -u USERNAME, --username=USERNAME " + echo " -W, --password " + echo " -d DBNAME, --database=DBNAME " + echo " -z, --analyze " + echo " -t TABLE[(columns)], --table=TABLE[(columns)]" + echo " -v, --verbose " + echo " -e, --echo " + echo " -q, --quiet " + echo " -?, --help " + echo "" + exit 1 fi if [ -z "$dbname" ]; then |