diff options
| author | Peter Eisentraut <peter_e@gmx.net> | 2000-04-25 08:29:02 +0000 |
|---|---|---|
| committer | Peter Eisentraut <peter_e@gmx.net> | 2000-04-25 08:29:02 +0000 |
| commit | 282861ad755ecb06bd2f724f8f1dcf0a3c530213 (patch) | |
| tree | f864b886760a75ec70c5b5999f63ab84b874376c /src | |
| parent | f46c1f1e336100de405b7e1312462e11aa36255e (diff) | |
| download | postgresql-282861ad755ecb06bd2f724f8f1dcf0a3c530213.tar.gz postgresql-282861ad755ecb06bd2f724f8f1dcf0a3c530213.zip | |
initdb didn't always remove temp file
Diffstat (limited to 'src')
| -rw-r--r-- | src/bin/initdb/initdb.sh | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/src/bin/initdb/initdb.sh b/src/bin/initdb/initdb.sh index b4d0f9d2d9e..3712a7a38a9 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" \ |