@@ -80,7 +80,7 @@ if [ "$1" = '--install' ]; then
8080# use psql from the proper installation directory, which might
8181# be outdated or missing. But don't override anything else that's
8282# already in EXTRA_REGRESS_OPTS.
83- EXTRA_REGRESS_OPTS=" $EXTRA_REGRESS_OPTS --psqldir=$bindir "
83+ EXTRA_REGRESS_OPTS=" $EXTRA_REGRESS_OPTS --psqldir=' $bindir ' "
8484export EXTRA_REGRESS_OPTS
8585fi
8686
@@ -117,7 +117,7 @@ PGCONNECT_TIMEOUT=""; unset PGCONNECT_TIMEOUT
117117PGHOSTADDR=" " ; unset PGHOSTADDR
118118
119119# Select a non-conflicting port number, similarly to pg_regress.c
120- PG_VERSION_NUM=` grep' #define PG_VERSION_NUM' $newsrc /src/include/pg_config.h| awk' {print $3}' `
120+ PG_VERSION_NUM=` grep' #define PG_VERSION_NUM' " $newsrc " | awk' {print $3}' `
121121PGPORT=` expr$PG_VERSION_NUM % 16384 + 49152`
122122export PGPORT
123123
@@ -141,8 +141,8 @@ export EXTRA_REGRESS_OPTS
141141# enable echo so the user can see what is being executed
142142set -x
143143
144- $oldbindir /initdb -N
145- $oldbindir /pg_ctl start -l" $logdir /postmaster1.log" " $POSTMASTER_OPTS "
144+ " $oldbindir "
145+ " $oldbindir " " $logdir /postmaster1.log" " $POSTMASTER_OPTS "
146146if " $MAKE " " $oldsrc " ; then
147147pg_dumpall -f" $temp_root " || pg_dumpall1_status=$?
148148if [" $newsrc " != " $oldsrc " ; then
@@ -167,7 +167,7 @@ if "$MAKE" -C "$oldsrc" installcheck; then
167167else
168168make_installcheck_status=$?
169169fi
170- $oldbindir /pg_ctl -m fast stop
170+ " $oldbindir "
171171if [-n " $make_installcheck_status " ; then
172172exit 1
173173fi