Unbreak pgpool_setup.

The command did not work in standalone anymore.

diff --git a/src/test/pgpool_setup b/src/test/pgpool_setup
old mode 100644 (file)
new mode 100755 (executable)
index 1922638..2200977
--- a/src/test/pgpool_setup
+++ b/src/test/pgpool_setup
@@ -54,7 +54,10 @@ BASEPORT=11000
 # Default number of PostgreSQL database clusters
 NUMCLUSTERS=2
 # Where to look for pgpool.conf.sample*
+PGPOOL_INSTALL_DIR=${PGPOOL_INSTALL_DIR:-"/usr/local"}
 PGPOOLDIR=$PGPOOL_INSTALL_DIR/etc
+# PostgreSQL commands(initdb, pg_ctl, psql) install dir
+PGBIN=${PGBIN:-"/usr/local/pgsql/bin"}
 # LD_LIBRARY_PATH 
 LPATH=/usr/local/pgsql/lib
 # initdb args
@@ -664,11 +667,14 @@ cp $SAMPLE_CONF $CONF
 echo "creating startall and shutdownall"
 echo "LD_LIBRARY_PATH=$LPATH" > $STARTALL
 echo 'dir=`pwd`' >> $STARTALL
+echo "PGPOOL_INSTALL_DIR=$PGPOOL_INSTALL_DIR" >> $STARTALL
 chmod 755 $STARTALL
 echo 'dir=`pwd`' > $SHUTDOWNALL
+echo "PGPOOL_INSTALL_DIR=$PGPOOL_INSTALL_DIR" >> $SHUTDOWNALL
 echo '$PGPOOL_INSTALL_DIR/bin/pgpool -f $dir/etc/pgpool.conf -m f stop' >> $SHUTDOWNALL
 chmod 755 $SHUTDOWNALL
 echo 'dir=`pwd`' > $PGPOOL_RELOAD
+echo "PGPOOL_INSTALL_DIR=$PGPOOL_INSTALL_DIR" >> $PGPOOL_RELOAD
 echo '$PGPOOL_INSTALL_DIR/bin/pgpool -f $dir/etc/pgpool.conf reload' >> $PGPOOL_RELOAD
 chmod 755 $PGPOOL_RELOAD