X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=tests%2Fcommand%2Fget-data-psql.sh;h=fa61d6d684db5ee9ea1060ad6f6dd69cc31f2666;hb=d6f31aec49cf2d0913ed4e88b0d821b296e9e167;hp=7735c36b04e2138ad958413eb1ce767643cf573a;hpb=274c90615ffd6975784232b709cff0b99da8b38d;p=pspp

diff --git a/tests/command/get-data-psql.sh b/tests/command/get-data-psql.sh
index 7735c36b04..fa61d6d684 100755
--- a/tests/command/get-data-psql.sh
+++ b/tests/command/get-data-psql.sh
@@ -22,7 +22,7 @@ export LANG
 port=6543
 dbase=pspptest
 PG_CONFIG=${PG_CONFIG:=pg_config}
-pgpath=`$PG_CONFIG | awk '/BINDIR/{print $3}'`
+pgpath=`$PG_CONFIG --bindir`
 
 cleanup()
 {
@@ -31,6 +31,7 @@ cleanup()
      	return ; 
     fi
     PGHOST=$TEMPDIR $pgpath/pg_ctl -D $TEMPDIR/cluster  stop -W -o "-k $TEMPDIR -h ''"   > /dev/null 2>&1
+    cd /
     rm -rf $TEMPDIR
 }