From 522db4d98e71ccd7a8bf6b933c8516df77ddbc6a Mon Sep 17 00:00:00 2001
From: Christian Grothoff <christian@grothoff.org>
Date: Sun, 8 Nov 2020 23:47:11 +0100
Subject: [PATCH] use --help instead of -h

---
 contrib/gana                           | 2 +-
 src/auditor/generate-auditor-basedb.sh | 2 +-
 src/auditor/test-auditor.sh            | 4 ++--
 src/auditor/test-revocation.sh         | 2 +-
 src/exchangedb/drop0001.sql            | 3 +--
 5 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/contrib/gana b/contrib/gana
index 3f974ec9d..05da9c93f 160000
--- a/contrib/gana
+++ b/contrib/gana
@@ -1 +1 @@
-Subproject commit 3f974ec9d5fd9ce604ac612cc344d3f50bd993c0
+Subproject commit 05da9c93fc7fff258e54a9413d11ea72a82fe03f
diff --git a/src/auditor/generate-auditor-basedb.sh b/src/auditor/generate-auditor-basedb.sh
index 121e51d9b..86e8fe2ec 100755
--- a/src/auditor/generate-auditor-basedb.sh
+++ b/src/auditor/generate-auditor-basedb.sh
@@ -56,7 +56,7 @@ cp generate-auditor-basedb-template.conf $CONF
 
 
 echo -n "Testing for taler-bank-manage"
-taler-bank-manage -h >/dev/null </dev/null || exit_skip " MISSING"
+taler-bank-manage --help >/dev/null </dev/null || exit_skip " MISSING"
 echo " FOUND"
 echo -n "Testing for taler-wallet-cli"
 taler-wallet-cli -v >/dev/null </dev/null || exit_skip " MISSING"
diff --git a/src/auditor/test-auditor.sh b/src/auditor/test-auditor.sh
index 92840d48a..14d4a647e 100755
--- a/src/auditor/test-auditor.sh
+++ b/src/auditor/test-auditor.sh
@@ -362,7 +362,7 @@ echo "OK"
 function test_2() {
 
 echo "===========2: reserves_in inconsistency==========="
-echo "UPDATE reserves_in SET credit_val=5 WHERE reserve_in_serial_id=1" | psql -Aqt $DB
+echo "UPDATE reserves_in SET credit_val=5 WHERE reserve_in_serial_id=1" | psql -At $DB
 
 run_audit
 
@@ -1848,7 +1848,7 @@ CONF=test-auditor.conf
 echo "Testing for jq"
 jq -h > /dev/null || exit_skip "jq required"
 echo "Testing for taler-bank-manage"
-taler-bank-manage -h >/dev/null </dev/null || exit_skip "taler-bank-manage required"
+taler-bank-manage --help >/dev/null </dev/null || exit_skip "taler-bank-manage required"
 echo "Testing for pdflatex"
 which pdflatex > /dev/null </dev/null || exit_skip "pdflatex required"
 
diff --git a/src/auditor/test-revocation.sh b/src/auditor/test-revocation.sh
index dfec08a17..6e1b2f847 100755
--- a/src/auditor/test-revocation.sh
+++ b/src/auditor/test-revocation.sh
@@ -520,7 +520,7 @@ CONF=test-auditor.conf
 echo "Testing for jq"
 jq -h > /dev/null || exit_skip "jq required"
 echo "Testing for taler-bank-manage"
-taler-bank-manage -h >/dev/null </dev/null || exit_skip "taler-bank-manage required"
+taler-bank-manage --help >/dev/null </dev/null || exit_skip "taler-bank-manage required"
 echo "Testing for pdflatex"
 which pdflatex > /dev/null </dev/null || exit_skip "pdflatex required"
 
diff --git a/src/exchangedb/drop0001.sql b/src/exchangedb/drop0001.sql
index 4d06fd510..f5a28192f 100644
--- a/src/exchangedb/drop0001.sql
+++ b/src/exchangedb/drop0001.sql
@@ -17,8 +17,7 @@
 -- Everything in one big transaction
 BEGIN;
 
--- This script DROPs all of the tables we create, including the
--- versioning schema!
+-- This script DROPs all of the tables we create.
 --
 -- Unlike the other SQL files, it SHOULD be updated to reflect the
 -- latest requirements for dropping tables.