initdb didn't always remove temp file

This commit is contained in:
Peter Eisentraut 2000-04-25 08:29:02 +00:00
parent f46c1f1e33
commit 282861ad75
1 changed files with 3 additions and 9 deletions

View File

@ -26,7 +26,7 @@
#
#
# IDENTIFICATION
# $Header: /cvsroot/pgsql/src/bin/initdb/Attic/initdb.sh,v 1.90 2000/04/08 18:35:29 momjian Exp $
# $Header: /cvsroot/pgsql/src/bin/initdb/Attic/initdb.sh,v 1.91 2000/04/25 08:29:02 petere Exp $
#
#-------------------------------------------------------------------------
@ -476,10 +476,7 @@ then
"$PGPATH"/postgres $BACKENDARGS template1 < "$TEMPFILE"
# Gotta remove that temp file before exiting on error.
retval="$?"
if [ "$noclean" -eq 0 ]
then
rm -f "$TEMPFILE" || exit_nicely
fi
rm -f "$TEMPFILE" || exit_nicely
[ "$retval" -ne 0 ] && exit_nicely
fi
@ -596,10 +593,7 @@ cat "$GLOBAL_DESCR" >> $TEMPFILE
cat $TEMPFILE \
| "$PGPATH"/postgres $PGSQL_OPT template1 > /dev/null || exit_nicely
if [ "$noclean" -eq 0 ]
then
rm -f "$TEMPFILE" || exit_nicely
fi
rm -f "$TEMPFILE" || exit_nicely
echo "Vacuuming database."
echo "VACUUM ANALYZE" \