[taler-exchange] branch master updated: fix #8019

[gnunet]

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 afdccca7 fix #8019
afdccca7 is described below

commit afdccca78c95fe863f43614c92e4288a6bd79024
Author: Christian Grothoff <grothoff@gnunet.org>
AuthorDate: Fri Dec 22 14:36:19 2023 +0800

    fix #8019
---
 contrib/Makefile.am.in                                    | 15 +--------------
 contrib/gana                                              |  2 +-
 .../{taler-terms-generator.in => taler-terms-generator}   |  4 ++--
 contrib/wallet-core                                       |  2 +-
 src/exchange/exchange.conf                                |  4 ++--
 5 files changed, 7 insertions(+), 20 deletions(-)

diff --git a/contrib/Makefile.am.in b/contrib/Makefile.am.in
index 57853e99..73dee525 100644
--- a/contrib/Makefile.am.in
+++ b/contrib/Makefile.am.in
@@ -35,22 +35,9 @@ bin_SCRIPTS = \
   taler-bank-manage-testing
 
 
-edit_script = $(SED) -e 's,%termsdir%,$(termsdir),'g -e 
's,%localedir%,$(localedir),'g $(NULL)
-taler-terms-generator: taler-terms-generator.in
-       rm -f $@ $@.tmp && \
-       $(edit_script) $< >$@.tmp && \
-       chmod a-w+x $@.tmp && \
-       mv $@.tmp $@
-
-CLEANFILES = \
-  taler-terms-generator
-
 EXTRA_DIST = \
   locale/de/LC_MESSAGES/exchange-tos-v0.po \
-  taler-bank-manage-testing \
-  taler-terms-generator.in \
-  taler-auditor-dbconfig \
-  taler-exchange-dbconfig \
+  $(bin_SCRIPTS) \
   gana-generate.sh \
   gana/gnu-taler-error-codes/registry.rec \
   gana/gnu-taler-error-codes/Makefile \
diff --git a/contrib/gana b/contrib/gana
index ec6c8212..91e5fd6e 160000
--- a/contrib/gana
+++ b/contrib/gana
@@ -1 +1 @@
-Subproject commit ec6c82120f0c3dca85429b86652fd25d3c25a886
+Subproject commit 91e5fd6edb1b3567fd151960059ffb911973a447
diff --git a/contrib/taler-terms-generator.in b/contrib/taler-terms-generator
similarity index 99%
rename from contrib/taler-terms-generator.in
rename to contrib/taler-terms-generator
index 04f7ec3e..38ccd6cc 100755
--- a/contrib/taler-terms-generator.in
+++ b/contrib/taler-terms-generator
@@ -98,8 +98,8 @@ function failcat ()
 # defaults
 AUTHOR="GNU Taler team"
 VERSION="exchange-tos-v0"
-LOCALE_DIR="%localedir%"
-OUTPUT="%termsdir%"
+LOCALE_DIR=$(taler-config -s "LOCALEDIR" -f)
+OUTPUT=$(taler-config -s "TERMS_DIR" -f)
 PAPER="a4"
 COPYRIGHT="2014-2023 Taler Systems SA (GPLv3+ or GFDL 1.3+)"
 
diff --git a/contrib/wallet-core b/contrib/wallet-core
index ec95723a..0c211082 160000
--- a/contrib/wallet-core
+++ b/contrib/wallet-core
@@ -1 +1 @@
-Subproject commit ec95723a68d36620aa66109c329437612383830b
+Subproject commit 0c211082e0b8372f8fa1cef8102e477c7363d9ba
diff --git a/src/exchange/exchange.conf b/src/exchange/exchange.conf
index f7387ced..40eeb5e1 100644
--- a/src/exchange/exchange.conf
+++ b/src/exchange/exchange.conf
@@ -126,13 +126,13 @@ WIREWATCH_IDLE_SLEEP_INTERVAL = 1 s
 SIGNKEY_LEGAL_DURATION = 2 years
 
 # Directory with our terms of service.
-TERMS_DIR = $DATADIR/terms/
+TERMS_DIR = $TALER_DATA_HOME/terms/
 
 # Etag / filename for the terms of service.
 TERMS_ETAG = exchange-tos-v0
 
 # Directory with our privacy policy.
-PRIVACY_DIR = $DATADIR/terms/
+PRIVACY_DIR = $TALER_DATA_HOME/terms/
 
 # Etag / filename for the privacy policy.
 PRIVACY_ETAG = exchange-pp-v0

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.