From 282861ad755ecb06bd2f724f8f1dcf0a3c530213 Mon Sep 17 00:00:00 2001 From: Peter Eisentraut Date: Tue, 25 Apr 2000 08:29:02 +0000 Subject: [PATCH] initdb didn't always remove temp file --- src/bin/initdb/initdb.sh | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/bin/initdb/initdb.sh b/src/bin/initdb/initdb.sh index b4d0f9d2d9..3712a7a38a 100644 --- a/src/bin/initdb/initdb.sh +++ b/src/bin/initdb/initdb.sh @@ -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" \ -- 2.40.0