diff options
| author | Christian Grothoff <christian@grothoff.org> | 2023-08-23 21:28:24 +0200 |
|---|---|---|
| committer | Christian Grothoff <christian@grothoff.org> | 2023-08-23 21:28:24 +0200 |
| commit | ad4b829e2feae6dc9aee2d5fe35cf9c6a3d09e6d (patch) | |
| tree | 275032a0ec8b33ffd75bfc11fdeb3bdf413fb348 | |
| parent | 50f9cab93d6e457c531ae3c59f53401f59c8f13e (diff) | |
| download | exchange-ad4b829e2feae6dc9aee2d5fe35cf9c6a3d09e6d.tar.gz exchange-ad4b829e2feae6dc9aee2d5fe35cf9c6a3d09e6d.tar.bz2 exchange-ad4b829e2feae6dc9aee2d5fe35cf9c6a3d09e6d.zip | |
minor fixes
| -rwxr-xr-x | src/auditor/batch.sh | 18 | ||||
| -rwxr-xr-x | src/auditor/setup.sh | 2 | ||||
| -rwxr-xr-x | src/testing/taler-unified-setup.sh | 3 |
3 files changed, 12 insertions, 11 deletions
diff --git a/src/auditor/batch.sh b/src/auditor/batch.sh index 1f8896c42..36ee37f19 100755 --- a/src/auditor/batch.sh +++ b/src/auditor/batch.sh @@ -64,22 +64,22 @@ createdb $TARGET_DB || exit_skip "Could not create database $TARGET_DB" # obtain key configuration data -MASTER_PRIV_FILE=`taler-config -f -c $CONF -s exchange-offline -o MASTER_PRIV_FILE` -MASTER_PRIV_DIR=`dirname $MASTER_PRIV_FILE` +MASTER_PRIV_FILE=$(taler-config -f -c $CONF -s exchange-offline -o MASTER_PRIV_FILE) +MASTER_PRIV_DIR=$(dirname $MASTER_PRIV_FILE) mkdir -p $MASTER_PRIV_DIR gnunet-ecc -g1 $MASTER_PRIV_FILE > /dev/null -MASTER_PUB=`gnunet-ecc -p $MASTER_PRIV_FILE` -EXCHANGE_URL=`taler-config -c $CONF -s EXCHANGE -o BASE_URL` -MERCHANT_PORT=`taler-config -c $CONF -s MERCHANT -o PORT` +MASTER_PUB=$(gnunet-ecc -p $MASTER_PRIV_FILE) +EXCHANGE_URL=$(taler-config -c $CONF -s EXCHANGE -o BASE_URL) +MERCHANT_PORT=$(taler-config -c $CONF -s MERCHANT -o PORT) MERCHANT_URL=http://localhost:${MERCHANT_PORT}/ -BANK_PORT=`taler-config -c $CONF -s BANK -o HTTP_PORT` +BANK_PORT=$(taler-config -c $CONF -s BANK -o HTTP_PORT) BANK_URL=http://localhost:${BANK_PORT}/ AUDITOR_URL=http://localhost:8083/ -AUDITOR_PRIV_FILE=`taler-config -f -c $CONF -s AUDITOR -o AUDITOR_PRIV_FILE` -AUDITOR_PRIV_DIR=`dirname $AUDITOR_PRIV_FILE` +AUDITOR_PRIV_FILE=$(taler-config -f -c $CONF -s AUDITOR -o AUDITOR_PRIV_FILE) +AUDITOR_PRIV_DIR=$(dirname $AUDITOR_PRIV_FILE) mkdir -p $AUDITOR_PRIV_DIR gnunet-ecc -g1 $AUDITOR_PRIV_FILE > /dev/null -AUDITOR_PUB=`gnunet-ecc -p $AUDITOR_PRIV_FILE` +AUDITOR_PUB=$(gnunet-ecc -p $AUDITOR_PRIV_FILE) echo "AUDITOR PUB is $AUDITOR_PUB using file $AUDITOR_PRIV_FILE" diff --git a/src/auditor/setup.sh b/src/auditor/setup.sh index 3776978d4..87946b05c 100755 --- a/src/auditor/setup.sh +++ b/src/auditor/setup.sh @@ -16,7 +16,7 @@ function exit_cleanup() if [ ! -z ${SETUP_PID+x} ] then echo "Killing taler-unified-setup ($SETUP_PID)" >&2 - kill -TERM "$SETUP_PID" + kill -TERM "$SETUP_PID" 2> /dev/null || true wait fi } diff --git a/src/testing/taler-unified-setup.sh b/src/testing/taler-unified-setup.sh index bdd7bf192..bb77ae37d 100755 --- a/src/testing/taler-unified-setup.sh +++ b/src/testing/taler-unified-setup.sh @@ -462,12 +462,13 @@ fi if [ "1" = "$START_FAKEBANK" ] then - echo "Setting up fakebank ..." + echo -n "Setting up fakebank ..." $USE_VALGRIND taler-fakebank-run\ -c "$CONF" \ -L "$LOGLEVEL" \ -n 4 \ 2> taler-fakebank-run.log & + echo " OK" fi if [ "1" = "$START_EXCHANGE" ] |