Skip to content

P
Postgres FD Implementation
Commit 282861ad authored by Peter Eisentraut's avatar Peter Eisentraut
Browse files
Options

initdb didn't always remove temp file

parent f46c1f1e
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 9 deletions
src/bin/initdb/initdb.sh
View file @ 282861ad
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
# #
# #
# IDENTIFICATION # 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 ...@@ -476,10 +476,7 @@ then
"$PGPATH"/postgres $BACKENDARGS template1 < "$TEMPFILE" "$PGPATH"/postgres $BACKENDARGS template1 < "$TEMPFILE"
# Gotta remove that temp file before exiting on error. # Gotta remove that temp file before exiting on error.
retval="$?" retval="$?"
if [ "$noclean" -eq 0 ] rm -f "$TEMPFILE" || exit_nicely
then
rm -f "$TEMPFILE" || exit_nicely
fi
[ "$retval" -ne 0 ] && exit_nicely [ "$retval" -ne 0 ] && exit_nicely
fi fi
...@@ -596,10 +593,7 @@ cat "$GLOBAL_DESCR" >> $TEMPFILE ...@@ -596,10 +593,7 @@ cat "$GLOBAL_DESCR" >> $TEMPFILE
cat $TEMPFILE \ cat $TEMPFILE \
| "$PGPATH"/postgres $PGSQL_OPT template1 > /dev/null || exit_nicely | "$PGPATH"/postgres $PGSQL_OPT template1 > /dev/null || exit_nicely
if [ "$noclean" -eq 0 ] rm -f "$TEMPFILE" || exit_nicely
then
rm -f "$TEMPFILE" || exit_nicely
fi
echo "Vacuuming database." echo "Vacuuming database."
echo "VACUUM ANALYZE" \ echo "VACUUM ANALYZE" \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment