taler/exchange
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

keep helpers in normal bin/ dir

Browse Source
This commit is contained in:
Christian Grothoff 2020-12-31 22:31:32 +01:00
parent b5534977a3
commit 6b70f2e454
No known key found for this signature in database
GPG Key ID: 939E6BE1E29FC3CC
6 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/auditor/generate-auditor-basedb.sh
View File

@ -115,8 +115,8 @@ taler-bank-manage-testing $CONF postgres:///$TARGET_DB serve &> taler-bank.log &
TFN=`which taler-exchange-httpd` TFN=`which taler-exchange-httpd`
TBINPFX=`dirname $TFN` TBINPFX=`dirname $TFN`
TLIBEXEC=${TBINPFX}/../lib/taler/libexec/ 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 &
$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 &
taler-exchange-httpd -c $CONF 2> taler-exchange-httpd.log & taler-exchange-httpd -c $CONF 2> taler-exchange-httpd.log &
taler-merchant-httpd -c $CONF -L INFO 2> taler-merchant-httpd.log & taler-merchant-httpd -c $CONF -L INFO 2> taler-merchant-httpd.log &
taler-exchange-wirewatch -c $CONF 2> taler-exchange-wirewatch.log & taler-exchange-wirewatch -c $CONF 2> taler-exchange-wirewatch.log &

8
src/auditor/generate-revoke-basedb.sh
View File

@ -103,9 +103,9 @@ taler-bank-manage-testing $CONF postgres:///$TARGET_DB serve &> revocation-bank.
TFN=`which taler-exchange-httpd` TFN=`which taler-exchange-httpd`
TBINPFX=`dirname $TFN` TBINPFX=`dirname $TFN`
TLIBEXEC=${TBINPFX}/../lib/taler/libexec/ 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=$! 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=$! DENOM_HELPER_PID=$!
taler-exchange-httpd -c $CONF 2> taler-exchange-httpd.log & taler-exchange-httpd -c $CONF 2> taler-exchange-httpd.log &
EXCHANGE_PID=$! EXCHANGE_PID=$!
@ -277,9 +277,9 @@ echo "Launching exchange 1 week in the future"
kill -TERM $EXCHANGE_PID kill -TERM $EXCHANGE_PID
kill -TERM $DENOM_HELPER_PID kill -TERM $DENOM_HELPER_PID
kill -TERM $SIGNKEY_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=$! 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=$! DENOM_HELPER_PID=$!
taler-exchange-httpd $TIMETRAVEL -c $CONF 2> taler-exchange-httpd.log & taler-exchange-httpd $TIMETRAVEL -c $CONF 2> taler-exchange-httpd.log &
export EXCHANGE_PID=$! export EXCHANGE_PID=$!

2
src/testing/testing_api_helpers_exchange.c
View File

@ -586,7 +586,7 @@ start_helpers (const char *config_filename,
pd = GNUNET_OS_project_data_get (); pd = GNUNET_OS_project_data_get ();
GNUNET_OS_init (TALER_project_data_default ()); 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); GNUNET_OS_init (pd);
if (NULL == dir) if (NULL == dir)
{ {

4
src/util/Makefile.am
View File

@ -7,8 +7,6 @@ if USE_COVERAGE
endif endif
libexecdir = $(libdir)/taler/libexec
pkgcfgdir = $(prefix)/share/taler/config.d/ pkgcfgdir = $(prefix)/share/taler/config.d/
pkgcfg_DATA = \ pkgcfg_DATA = \
@ -22,7 +20,7 @@ EXTRA_DIST = \
test_helper_eddsa.conf \ test_helper_eddsa.conf \
test_helper_rsa.conf test_helper_rsa.conf
libexec_PROGRAMS = \ bin_PROGRAMS = \
taler-helper-crypto-eddsa \ taler-helper-crypto-eddsa \
taler-helper-crypto-rsa taler-helper-crypto-rsa

2
src/util/test_helper_eddsa.c
View File

@ -391,7 +391,7 @@ main (int argc,
"WARNING", "WARNING",
NULL); NULL);
GNUNET_OS_init (TALER_project_data_default ()); 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, GNUNET_asprintf (&binary_name,
"%s/%s", "%s/%s",
libexec_dir, libexec_dir,

2
src/util/test_helper_rsa.c
View File

@ -537,7 +537,7 @@ main (int argc,
"WARNING", "WARNING",
NULL); NULL);
GNUNET_OS_init (TALER_project_data_default ()); 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, GNUNET_asprintf (&binary_name,
"%s/%s", "%s/%s",
libexec_dir, libexec_dir,