[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-exchange] branch master updated: keep helpers in normal bin/ dir
From: |
gnunet |
Subject: |
[taler-exchange] branch master updated: keep helpers in normal bin/ dir |
Date: |
Thu, 31 Dec 2020 22:31:34 +0100 |
This is an automated email from the git hooks/post-receive script.
grothoff pushed a commit to branch master
in repository exchange.
The following commit(s) were added to refs/heads/master by this push:
new 6b70f2e4 keep helpers in normal bin/ dir
6b70f2e4 is described below
commit 6b70f2e45476c573da5d367734f964ded80659eb
Author: Christian Grothoff <christian@grothoff.org>
AuthorDate: Thu Dec 31 22:31:32 2020 +0100
keep helpers in normal bin/ dir
---
src/auditor/generate-auditor-basedb.sh | 4 ++--
src/auditor/generate-revoke-basedb.sh | 8 ++++----
src/testing/testing_api_helpers_exchange.c | 2 +-
src/util/Makefile.am | 4 +---
src/util/test_helper_eddsa.c | 2 +-
src/util/test_helper_rsa.c | 2 +-
6 files changed, 10 insertions(+), 12 deletions(-)
diff --git a/src/auditor/generate-auditor-basedb.sh
b/src/auditor/generate-auditor-basedb.sh
index 93905983..52e4e3eb 100755
--- a/src/auditor/generate-auditor-basedb.sh
+++ b/src/auditor/generate-auditor-basedb.sh
@@ -115,8 +115,8 @@ taler-bank-manage-testing $CONF postgres:///$TARGET_DB
serve &> taler-bank.log &
TFN=`which taler-exchange-httpd`
TBINPFX=`dirname $TFN`
TLIBEXEC=${TBINPFX}/../lib/taler/libexec/
-$TLIBEXEC/taler-helper-crypto-eddsa -c $CONF 2> taler-helper-crypto-eddsa.log &
-$TLIBEXEC/taler-helper-crypto-rsa -c $CONF 2> taler-helper-crypto-rsa.log &
+taler-helper-crypto-eddsa -c $CONF 2> taler-helper-crypto-eddsa.log &
+taler-helper-crypto-rsa -c $CONF 2> taler-helper-crypto-rsa.log &
taler-exchange-httpd -c $CONF 2> taler-exchange-httpd.log &
taler-merchant-httpd -c $CONF -L INFO 2> taler-merchant-httpd.log &
taler-exchange-wirewatch -c $CONF 2> taler-exchange-wirewatch.log &
diff --git a/src/auditor/generate-revoke-basedb.sh
b/src/auditor/generate-revoke-basedb.sh
index d415491d..c59ee961 100755
--- a/src/auditor/generate-revoke-basedb.sh
+++ b/src/auditor/generate-revoke-basedb.sh
@@ -103,9 +103,9 @@ taler-bank-manage-testing $CONF postgres:///$TARGET_DB
serve &> revocation-bank.
TFN=`which taler-exchange-httpd`
TBINPFX=`dirname $TFN`
TLIBEXEC=${TBINPFX}/../lib/taler/libexec/
-$TLIBEXEC/taler-helper-crypto-eddsa -c $CONF 2> taler-helper-crypto-eddsa.log &
+taler-helper-crypto-eddsa -c $CONF 2> taler-helper-crypto-eddsa.log &
SIGNKEY_HELPER_PID=$!
-$TLIBEXEC/taler-helper-crypto-rsa -c $CONF 2> taler-helper-crypto-rsa.log &
+taler-helper-crypto-rsa -c $CONF 2> taler-helper-crypto-rsa.log &
DENOM_HELPER_PID=$!
taler-exchange-httpd -c $CONF 2> taler-exchange-httpd.log &
EXCHANGE_PID=$!
@@ -277,9 +277,9 @@ echo "Launching exchange 1 week in the future"
kill -TERM $EXCHANGE_PID
kill -TERM $DENOM_HELPER_PID
kill -TERM $SIGNKEY_HELPER_PID
-$TLIBEXEC/taler-helper-crypto-eddsa $TIMETRAVEL -c $CONF 2>
taler-helper-crypto-eddsa.log &
+taler-helper-crypto-eddsa $TIMETRAVEL -c $CONF 2>
taler-helper-crypto-eddsa.log &
SIGNKEY_HELPER_PID=$!
-$TLIBEXEC/taler-helper-crypto-rsa $TIMETRAVEL -c $CONF 2>
taler-helper-crypto-rsa.log &
+taler-helper-crypto-rsa $TIMETRAVEL -c $CONF 2> taler-helper-crypto-rsa.log &
DENOM_HELPER_PID=$!
taler-exchange-httpd $TIMETRAVEL -c $CONF 2> taler-exchange-httpd.log &
export EXCHANGE_PID=$!
diff --git a/src/testing/testing_api_helpers_exchange.c
b/src/testing/testing_api_helpers_exchange.c
index a0f89054..7b65d8f8 100644
--- a/src/testing/testing_api_helpers_exchange.c
+++ b/src/testing/testing_api_helpers_exchange.c
@@ -586,7 +586,7 @@ start_helpers (const char *config_filename,
pd = GNUNET_OS_project_data_get ();
GNUNET_OS_init (TALER_project_data_default ());
- dir = GNUNET_OS_installation_get_path (GNUNET_OS_IPK_LIBEXECDIR);
+ dir = GNUNET_OS_installation_get_path (GNUNET_OS_IPK_BINDIR);
GNUNET_OS_init (pd);
if (NULL == dir)
{
diff --git a/src/util/Makefile.am b/src/util/Makefile.am
index 2c8038d0..8d3ed742 100644
--- a/src/util/Makefile.am
+++ b/src/util/Makefile.am
@@ -7,8 +7,6 @@ if USE_COVERAGE
endif
-libexecdir = $(libdir)/taler/libexec
-
pkgcfgdir = $(prefix)/share/taler/config.d/
pkgcfg_DATA = \
@@ -22,7 +20,7 @@ EXTRA_DIST = \
test_helper_eddsa.conf \
test_helper_rsa.conf
-libexec_PROGRAMS = \
+bin_PROGRAMS = \
taler-helper-crypto-eddsa \
taler-helper-crypto-rsa
diff --git a/src/util/test_helper_eddsa.c b/src/util/test_helper_eddsa.c
index c2a3af74..12696571 100644
--- a/src/util/test_helper_eddsa.c
+++ b/src/util/test_helper_eddsa.c
@@ -391,7 +391,7 @@ main (int argc,
"WARNING",
NULL);
GNUNET_OS_init (TALER_project_data_default ());
- libexec_dir = GNUNET_OS_installation_get_path (GNUNET_OS_IPK_LIBEXECDIR);
+ libexec_dir = GNUNET_OS_installation_get_path (GNUNET_OS_IPK_BINDIR);
GNUNET_asprintf (&binary_name,
"%s/%s",
libexec_dir,
diff --git a/src/util/test_helper_rsa.c b/src/util/test_helper_rsa.c
index f86ebdef..8edab5ff 100644
--- a/src/util/test_helper_rsa.c
+++ b/src/util/test_helper_rsa.c
@@ -537,7 +537,7 @@ main (int argc,
"WARNING",
NULL);
GNUNET_OS_init (TALER_project_data_default ());
- libexec_dir = GNUNET_OS_installation_get_path (GNUNET_OS_IPK_LIBEXECDIR);
+ libexec_dir = GNUNET_OS_installation_get_path (GNUNET_OS_IPK_BINDIR);
GNUNET_asprintf (&binary_name,
"%s/%s",
libexec_dir,
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [taler-exchange] branch master updated: keep helpers in normal bin/ dir,
gnunet <=