diff options
| author | Thomas G. Lockhart <lockhart@fourpalms.org> | 1998-10-05 02:51:21 +0000 |
|---|---|---|
| committer | Thomas G. Lockhart <lockhart@fourpalms.org> | 1998-10-05 02:51:21 +0000 |
| commit | a54ba521019ff0f87d220686432b957b89bcaab9 (patch) | |
| tree | a4f6d4c882a72688418c2c813da7b7b2dffde829 | |
| parent | 86234a096508ac8666ad3f9c5f4bbb461a9718b2 (diff) | |
| download | postgresql-a54ba521019ff0f87d220686432b957b89bcaab9.tar.gz postgresql-a54ba521019ff0f87d220686432b957b89bcaab9.zip | |
Properly interpret environment variables passed as the input location.
| -rw-r--r-- | src/bin/initlocation/initlocation.sh | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/src/bin/initlocation/initlocation.sh b/src/bin/initlocation/initlocation.sh index 669d2cadc2f..72c106a179a 100644 --- a/src/bin/initlocation/initlocation.sh +++ b/src/bin/initlocation/initlocation.sh @@ -12,11 +12,12 @@ # # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/bin/initlocation/Attic/initlocation.sh,v 1.1 1997/11/07 06:21:39 thomas Exp $ +# $Header: /cvsroot/pgsql/src/bin/initlocation/Attic/initlocation.sh,v 1.2 1998/10/05 02:51:21 thomas Exp $ # #------------------------------------------------------------------------- CMDNAME=`basename $0` +POSTGRES_SUPERUSERNAME=$USER while [ "$#" -gt 0 ] do @@ -48,6 +49,13 @@ fi # Make sure he told us where to build the database area #------------------------------------------------------------------------- +PGENVAR="$PGALTDATA" +PGENVAR=`printenv $PGENVAR` +if [ ! -z "$PGENVAR" ]; then + PGALTDATA=$PGENVAR + echo "$CMDNAME: input argument points to $PGALTDATA" +fi + if [ -z "$PGALTDATA" ]; then echo "$CMDNAME: You must identify the target area, where the new data" echo "for this database system can reside. Do this with --location" @@ -58,11 +66,6 @@ fi # Figure out who the Postgres superuser for the new database system will be. #--------------------------------------------------------------------------- -if [ 1 -eq 0 ]; then -if [ -z "$POSTGRES_SUPERUSERNAME" ]; then - $POSTGRES_SUPERUSERNAME=pg_id -fi - if [ -z "$POSTGRES_SUPERUSERNAME" ]; then echo "Can't tell what username to use. You don't have the USER" echo "environment variable set to your username and didn't specify the " @@ -91,7 +94,6 @@ echo "We are initializing the database area with username" \ "$POSTGRES_SUPERUSERNAME (uid=$POSTGRES_SUPERUID)." echo "This user will own all the files and must also own the server process." echo -fi # ----------------------------------------------------------------------- # Create the data directory if necessary @@ -105,12 +107,14 @@ if [ ! -d $PGALTDATA ]; then echo mkdir $PGALTDATA if [ $? -ne 0 ]; then exit 1; fi + chown $POSTGRES_SUPERUSERNAME $PGALTDATA fi if [ ! -d $PGALTDATA/base ]; then echo "Creating Postgres database system directory $PGALTDATA/base" echo mkdir $PGALTDATA/base if [ $? -ne 0 ]; then exit 1; fi + chown $POSTGRES_SUPERUSERNAME $PGALTDATA/base fi exit |