challenger

commit 2eacd7f53c8e5eddb20eaf30ab968cf37ebda388
parent 9ee4f15d69c27a2a95cf7ad513d8577a06a93227
Author: Christian Grothoff <christian@grothoff.org>
Date:   Wed, 20 Nov 2024 19:36:25 +0100

new challenger-config style

Diffstat:
M
src/util/Makefile.am
 | 
19
+++++++------------
M
src/util/challenger-config.c
 | 
10
++++++----
D
src/util/challenger-config.in
 | 
13
-------------

3 files changed, 13 insertions(+), 29 deletions(-)
diff --git a/src/util/Makefile.am b/src/util/Makefile.am
@@ -12,22 +12,17 @@ pkgcfgdir = $(prefix)/share/challenger/config.d/
 pkgcfg_DATA = \
   paths.conf
 
-bin_SCRIPTS = \
+bin_PROGRAMS = \
   challenger-config
 
-edit_script = $(SED) -e 's,%libdir%,$(libdir),'g $(NULL)
-
-challenger-config: challenger-config.in
-	rm -f $@ $@.tmp && \
-	$(edit_script) $< >$@.tmp && \
-	chmod a-w+x $@.tmp && \
-	mv $@.tmp $@
-
-CLEANFILES = \
-  challenger-config
+challenger_config_SOURCES = \
+  challenger-config.c
+challenger_config_LDADD = \
+  libchallengerutil.la \
+ -lgnunetutil \
+  $(XLIB)
 
 EXTRA_DIST = \
-  $(bin_SCRIPTS) \
   $(pkgcfg_DATA) \
   challenger-config.in
 
diff --git a/src/util/challenger-config.c b/src/util/challenger-config.c
@@ -24,7 +24,6 @@
  * @author Christian Grothoff
  */
 #include "platform.h"
-#include "taler_util_lib.h"
 #include "challenger_util.h"
 
 
@@ -44,13 +43,16 @@ main (int argc,
     .global_ret = EXIT_SUCCESS
   };
   struct GNUNET_GETOPT_CommandLineOption options[] = {
+    GNUNET_GETOPT_option_help (CHALLENGER_project_data (),
+                               "challenger-config [OPTIONS]"),
+    GNUNET_GETOPT_option_version (CHALLENGER_project_data ()->version),
+    GNUNET_CONFIGURATION_CONFIG_OPTIONS (&cs),
     GNUNET_GETOPT_OPTION_END
   };
   enum GNUNET_GenericReturnValue ret;
 
-  TALER_OS_init ();
-  CHALLENGER_OS_init ();
-  ret = GNUNET_PROGRAM_run (argc,
+  ret = GNUNET_PROGRAM_run (CHALLENGER_project_data (),
+                            argc,
                             argv,
                             "taler-config [OPTIONS]",
                             gettext_noop (
diff --git a/src/util/challenger-config.in b/src/util/challenger-config.in
@@ -1,13 +0,0 @@
-#!/usr/bin/env bash
-
-set -eu
-
-if ! type gnunet-config >/dev/null; then
-  echo "$0 needs gnunet-config to be installed"
-  exit 1
-fi
-
-GC=`which gnunet-config`
-SO=`ls %libdir%/libchallengerutil.so.* | sort -n | tail -n1`
-export LD_PRELOAD=${LD_PRELOAD:-}:${SO}
-exec gnunet-config "$@"