27
27
# Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
28
28
# Portions Copyright (c) 1994, Regents of the University of California
29
29
#
30
- # $Header: /cvsroot/pgsql/src/bin/initdb/Attic/initdb.sh,v 1.128 2001/06/22 19:16:23 wieck Exp $
30
+ # $Header: /cvsroot/pgsql/src/bin/initdb/Attic/initdb.sh,v 1.129 2001/06/23 23:29:48 petere Exp $
31
31
#
32
32
# -------------------------------------------------------------------------
33
33
@@ -45,8 +45,6 @@ exit_nicely(){
45
45
echo " Removing $PGDATA ." 1>&2
46
46
rm -rf " $PGDATA " || echo " Failed." 1>&2
47
47
fi
48
- echo " Removing temp file $TEMPFILE ." 1>&2
49
- rm -rf " $TEMPFILE " || echo " Failed." 1>&2
50
48
else
51
49
echo " Data directory $PGDATA will not be removed at user's request." 1>&2
52
50
fi
@@ -65,12 +63,6 @@ datadir='@datadir@'
65
63
# as set by configure --enable-multibyte[=XXX].
66
64
MULTIBYTE=' @MULTIBYTE@'
67
65
68
- if [ " $TMPDIR " ]; then
69
- TEMPFILE=" $TMPDIR /initdb.$$ "
70
- else
71
- TEMPFILE=" /tmp/initdb.$$ "
72
- fi
73
-
74
66
75
67
# Check for echo -n vs echo \c
76
68
if echo ' \c' | grep -s c > /dev/null 2>&1
@@ -353,7 +345,7 @@ if [ "$show_setting" = yes ] || [ "$debug" = yes ]
353
345
then
354
346
echo
355
347
echo " Initdb variables:"
356
- for var in PGDATA datadir PGPATH TEMPFILE MULTIBYTE MULTIBYTEID \
348
+ for var in PGDATA datadir PGPATH MULTIBYTE MULTIBYTEID \
357
349
POSTGRES_SUPERUSERNAME POSTGRES_SUPERUSERID POSTGRES_BKI \
358
350
POSTGRES_DESCR POSTGRESQL_CONF_SAMPLE \
359
351
PG_HBA_SAMPLE PG_IDENT_SAMPLE ; do
@@ -807,12 +799,11 @@ echo "CREATE VIEW pg_stat_database AS \
807
799
| " $PGPATH " /postgres $PGSQL_OPT template1 > /dev/null || exit_nicely
808
800
809
801
echo " Loading pg_description."
810
- echo " COPY pg_description FROM STDIN " > $TEMPFILE
811
- cat " $POSTGRES_DESCR " >> $TEMPFILE
812
-
813
- cat $TEMPFILE \
802
+ (
803
+ echo " COPY pg_description FROM STDIN; " ;
804
+ cat " $POSTGRES_DESCR "
805
+ ) \
814
806
| " $PGPATH " /postgres $PGSQL_OPT template1 > /dev/null || exit_nicely
815
- rm -f " $TEMPFILE " || exit_nicely
816
807
817
808
echo " Setting lastsysoid."
818
809
echo " UPDATE pg_database SET \
0 commit comments