[taler-donau] branch master updated (59af47b -> 647f432)

[gnunet]

This is an automated email from the git hooks/post-receive script.

lukas-matyja pushed a change to branch master
in repository donau.

    from 59af47b  [db] working on query helper
     new f90c2c7  [util] add config
     new 313c80e  Merge remote-tracking branch 'refs/remotes/origin/master'
     new 647f432  [testing] some changes

The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 src/testing/donau-unified-setup.sh |  5 +--
 src/util/Makefile.am               | 17 +++++++++
 src/util/donau-config.c            | 73 ++++++++++++++++++++++++++++++++++++++
 3 files changed, 93 insertions(+), 2 deletions(-)
 mode change 100644 => 100755 src/testing/donau-unified-setup.sh
 create mode 100644 src/util/donau-config.c

diff --git a/src/testing/donau-unified-setup.sh 
b/src/testing/donau-unified-setup.sh
old mode 100644
new mode 100755
index b678735..ab6d349
--- a/src/testing/donau-unified-setup.sh
+++ b/src/testing/donau-unified-setup.sh
@@ -76,7 +76,7 @@ START_BANK=0
 START_TRANSFER=0
 START_WIREWATCH=0
 USE_ACCOUNT="exchange-account-1"
-USE_VALGRIN=""
+USE_VALGRIND=""
 WIRE_DOMAIN="x-taler-bank"
 CONF_ORIG="$HOME/.config/taler.conf"
 LOGLEVEL="DEBUG"
@@ -194,7 +194,7 @@ fi
 if [ "1" = "$START_DONAU" ]
 then
     echo -n "Testing for Donau"
-    donau-httpd -h > /dev/null || ext_skip " donau-httpd required"
+    donau-httpd -h > /dev/null || exit_skip " donau-httpd required"
     echo " FOUND"
 fi
 
@@ -226,6 +226,7 @@ then
     echo " FOUND"
 fi
 
+DONAU_URL=$(donau-config -c "$CONF" -s "DONAU" -o "BASE_URL")
 EXCHANGE_URL=$(taler-config -c "$CONF" -s "EXCHANGE" -o "BASE_URL")
 CURRENCY=$(taler-config -c "$CONF" -s "TALER" -o "CURRENCY")
 
diff --git a/src/util/Makefile.am b/src/util/Makefile.am
index 1f9f1e8..92f00ac 100644
--- a/src/util/Makefile.am
+++ b/src/util/Makefile.am
@@ -28,6 +28,23 @@ libdonauutil_la_LIBADD = \
   -lz \
   -lm
 
+EXTRA_DIST = \
+  donau-config.in
+
+bin_SCRIPTS = \
+  donau-config
+
+edit_script = $(SED) -e 's,%libdir%,$(libdir),'g $(NULL)
+
+donau-config: donau-config.in
+       rm -f $@ $@.tmp && \
+       $(edit_script) $< >$@.tmp && \
+       chmod a-w+x $@.tmp && \
+       mv $@.tmp $@
+
+CLEANFILES = \
+  donau-config
+
 libdonauutil_la_LDFLAGS = \
   -version-info 0:0:0 \
   -no-undefined
diff --git a/src/util/donau-config.c b/src/util/donau-config.c
new file mode 100644
index 0000000..6337e4f
--- /dev/null
+++ b/src/util/donau-config.c
@@ -0,0 +1,73 @@
+/*
+     This file is part of Taler.
+     Copyright (C) 2012-2021 Taler Systems SA
+
+     Taler is free software: you can redistribute it and/or modify it
+     under the terms of the GNU Affero General Public License as published
+     by the Free Software Foundation, either version 3 of the License,
+     or (at your option) any later version.
+
+     Taler is distributed in the hope that it will be useful, but
+     WITHOUT ANY WARRANTY; without even the implied warranty of
+     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+     Affero General Public License for more details.
+
+     You should have received a copy of the GNU Affero General Public License
+     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
+ */
+
+/**
+ * @file util/donau-config.c
+ * @brief tool to access and manipulate Taler configuration files
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "taler/taler_util_lib.h"
+
+
+/**
+ * Program to manipulate configuration files.
+ *
+ * @param argc number of arguments from the command line
+ * @param argv command line arguments
+ * @return 0 ok, 1 on error
+ */
+int
+main (int argc,
+      char *const *argv)
+{
+  struct GNUNET_CONFIGURATION_ConfigSettings cs = {
+    .api_version = GNUNET_UTIL_VERSION,
+    .global_ret = EXIT_SUCCESS
+  };
+  struct GNUNET_GETOPT_CommandLineOption options[] = {
+    GNUNET_GETOPT_OPTION_END
+  };
+  enum GNUNET_GenericReturnValue ret;
+
+  if (GNUNET_OK !=
+      GNUNET_STRINGS_get_utf8_args (argc, argv,
+                                    &argc, &argv))
+    return EXIT_FAILURE;
+  TALER_OS_init ();
+  ret = GNUNET_PROGRAM_run (argc,
+                            argv,
+                            "donau-config [OPTIONS]",
+                            gettext_noop (
+                              "Manipulate Taler configuration files"),
+                            options,
+                            &GNUNET_CONFIGURATION_config_tool_run,
+                            &cs);
+  GNUNET_free_nz ((void *) argv);
+  GNUNET_CONFIGURATION_config_settings_free (&cs);
+  if (GNUNET_NO == ret)
+    return 0;
+  if (GNUNET_SYSERR == ret)
+    return EXIT_INVALIDARGUMENT;
+  return cs.global_ret;
+}
+
+
+/* end of donau-config.c */

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