commit ddf0baf2b5e1ebeee37abc122de2227a3f0a6b03 parent c22149d02a97c6d61eb5dfd1b0d1c7af3ed4cb4e Author: Florian Dold <dold@taler.net> Date: Mon, 7 Sep 2026 22:04:10 +0200 auditor: skip revocation setup without merchant tools Check for the merchant configuration tool and daemon before creating the revocation database. Return the prerequisite skip status when either is unavailable, matching the other auditor scenarios. Diffstat:
| M | src/auditor/generate-revoke-basedb.sh | | | 5 | +++++ |
| M | src/auditor/test-revocation.sh | | | 5 | +++++ |
2 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/src/auditor/generate-revoke-basedb.sh b/src/auditor/generate-revoke-basedb.sh @@ -20,6 +20,11 @@ echo -n "Testing for curl ..." curl --help >/dev/null </dev/null || exit_skip " MISSING" echo " FOUND" +echo "Testing for taler-merchant-config" +taler-merchant-config -h > /dev/null || exit_skip "taler-merchant-config required" +echo "Testing for taler-merchant-httpd" +taler-merchant-httpd -h > /dev/null || exit_skip "taler-merchant-httpd required" + # reset database echo -n "Reset 'auditor-basedb' database ..." dropdb "auditor-basedb" >/dev/null 2>/dev/null || true diff --git a/src/auditor/test-revocation.sh b/src/auditor/test-revocation.sh @@ -704,6 +704,11 @@ taler-wallet-cli -h \ 2>/dev/null \ || exit_skip "taler-wallet-cli required" +echo "Testing for taler-merchant-config" +taler-merchant-config -h > /dev/null || exit_skip "taler-merchant-config required" +echo "Testing for taler-merchant-httpd" +taler-merchant-httpd -h > /dev/null || exit_skip "taler-merchant-httpd required" + MY_TMP_DIR=$(mktemp -d /tmp/taler-auditor-basedbXXXXXX) export MY_TMP_DIR echo "Using $MY_TMP_DIR for logging and temporary data"