summaryrefslogtreecommitdiff
path: root/src/auditor/test-sync.sh
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2022-09-24 00:51:15 +0200
committerChristian Grothoff <christian@grothoff.org>2022-09-24 00:51:15 +0200
commit7d40cd1904b33b704984e376e0b1882a3ec30b25 (patch)
tree89f43d7efaea876aa16f8089c69ea34db1446344 /src/auditor/test-sync.sh
parent035e052c39923ce9017ffc76a1baef054606a08d (diff)
downloadexchange-7d40cd1904b33b704984e376e0b1882a3ec30b25.tar.gz
exchange-7d40cd1904b33b704984e376e0b1882a3ec30b25.tar.bz2
exchange-7d40cd1904b33b704984e376e0b1882a3ec30b25.zip
-clean up scripts
Diffstat (limited to 'src/auditor/test-sync.sh')
-rwxr-xr-xsrc/auditor/test-sync.sh10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/auditor/test-sync.sh b/src/auditor/test-sync.sh
index 9ad1124b1..174e03c6e 100755
--- a/src/auditor/test-sync.sh
+++ b/src/auditor/test-sync.sh
@@ -120,8 +120,10 @@ else
fi
echo -n "Setting up Postgres DB"
POSTGRES_PATH=`dirname $INITDB_BIN`
-TMPDIR=`mktemp -d /tmp/taler-test-postgresXXXXXX`
-$INITDB_BIN --no-sync --auth=trust -D ${TMPDIR} > postgres-dbinit.log 2> postgres-dbinit.err
+MYDIR=`mktemp -d /tmp/taler-auditor-basedbXXXXXX`
+TMPDIR="$MYDIR/postgres/"
+mkdir -p $TMPDIR
+$INITDB_BIN --no-sync --auth=trust -D ${TMPDIR} > ${MYDIR}/postgres-dbinit.log 2> ${MYDIR}/postgres-dbinit.err
echo " DONE"
mkdir ${TMPDIR}/sockets
echo -n "Launching Postgres service"
@@ -135,12 +137,11 @@ listen_addresses=''
EOF
cat $TMPDIR/pg_hba.conf | grep -v host > $TMPDIR/pg_hba.conf.new
mv $TMPDIR/pg_hba.conf.new $TMPDIR/pg_hba.conf
-${POSTGRES_PATH}/pg_ctl -D $TMPDIR -l /dev/null start > postgres-start.log 2> postgres-start.err
+${POSTGRES_PATH}/pg_ctl -D $TMPDIR -l /dev/null start > ${MYDIR}/postgres-start.log 2> ${MYDIR}/postgres-start.err
echo " DONE"
PGHOST="$TMPDIR/sockets"
export PGHOST
-MYDIR=`mktemp -d /tmp/taler-auditor-basedbXXXXXX`
echo "Generating fresh database at $MYDIR"
if faketime -f '-1 d' ./generate-auditor-basedb.sh $MYDIR/auditor-basedb
then
@@ -151,7 +152,6 @@ then
else
echo "Cleaning up $MYDIR..."
rm -rf $MYDIR || echo "Removing $MYDIR failed"
- rm -rf $TMPDIR || echo "Removing $TMPDIR failed"
fi
else
echo "Generation failed"