From: Bruce Momjian <bruce@momjian.us>
Date: Sat, 27 Sep 2003 16:27:57 +0000 (+0000)
Subject: Make dump files created by initdb have consistent EOL termination, to
X-Git-Tag: REL7_4_BETA4~62
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e349584d5d26f7c03e16d7fd77efdb85867e9c7c;p=postgresql

Make dump files created by initdb have consistent EOL termination, to
pass COPY's EOL tests.
---

diff --git a/src/bin/initdb/initdb.sh b/src/bin/initdb/initdb.sh
index 5d99b7668f..dfce575fb3 100644
--- a/src/bin/initdb/initdb.sh
+++ b/src/bin/initdb/initdb.sh
@@ -27,7 +27,7 @@
 # Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group
 # Portions Copyright (c) 1994, Regents of the University of California
 #
-# $Header: /cvsroot/pgsql/src/bin/initdb/Attic/initdb.sh,v 1.202 2003/09/27 09:21:26 petere Exp $
+# $Header: /cvsroot/pgsql/src/bin/initdb/Attic/initdb.sh,v 1.203 2003/09/27 16:27:57 momjian Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -1091,8 +1091,9 @@ $ECHO_N "creating information schema... "$ECHO_C
   echo "COPY information_schema.sql_features (feature_id, feature_name, sub_feature_id, sub_feature_name, is_supported, comments) FROM STDIN;"
   cat "$datadir"/sql_features.txt
   echo "\."
-) \
-	| "$PGPATH"/postgres $PGSQL_OPT template1 > /dev/null || exit_nicely
+) |
+tr -d '\r' | # make newlines consistent for Win32
+"$PGPATH"/postgres $PGSQL_OPT template1 > /dev/null || exit_nicely
 echo "ok"
 
 $ECHO_N "vacuuming database template1... "$ECHO_C