*** pgsql-cvs/src/bin/initdb/initdb.sh	Fri Apr 28 18:13:01 2000
--- pgsql/src/bin/initdb/initdb.sh	Thu May 18 14:52:13 2000
***************
*** 35,42 ****
      echo
      echo "$CMDNAME failed."
      if [ "$noclean" -eq 0 ]; then
!         echo "Removing $PGDATA."
!         rm -rf "$PGDATA" || echo "Failed."
          echo "Removing temp file $TEMPFILE."
          rm -rf "$TEMPFILE" || echo "Failed."
      else
--- 35,44 ----
      echo
      echo "$CMDNAME failed."
      if [ "$noclean" -eq 0 ]; then
!         if [ yes = $made_new_PGDATA ]; then
!             echo "Removing $PGDATA."
!             rm -rf "$PGDATA" || echo "Failed."
!         fi
          echo "Removing temp file $TEMPFILE."
          rm -rf "$TEMPFILE" || echo "Failed."
      else
***************
*** 128,133 ****
--- 130,136 ----
  noclean=0
  template_only=0
  show_setting=0
+ made_new_PGDATA=
  
  # Note: There is a single compelling reason that the name of the database
  #       superuser be the same as the Unix user owning the server process:
***************
*** 396,403 ****
      fi
  else
      if [ ! -d "$PGDATA" ]
! 	then
          echo "Creating database system directory $PGDATA"
          mkdir "$PGDATA" || exit_nicely
      else
          echo "Fixing permissions on pre-existing data directory $PGDATA"
--- 399,407 ----
      fi
  else
      if [ ! -d "$PGDATA" ]
!     then
          echo "Creating database system directory $PGDATA"
+         made_new_PGDATA=yes
          mkdir "$PGDATA" || exit_nicely
      else
          echo "Fixing permissions on pre-existing data directory $PGDATA"