use user_config_file as well
This commit is contained in:
parent
f552b7e4c0
commit
3abb3bc372
@ -871,7 +871,7 @@ exchange_keys_update_denomkeys ()
|
||||
* @param cls closure
|
||||
* @param args remaining command-line arguments
|
||||
* @param cfgfile name of the configuration file used (for saving, can be NULL!)
|
||||
* @param c configuration
|
||||
* @param cfg configuration
|
||||
*/
|
||||
static void
|
||||
run (void *cls,
|
||||
|
@ -22,6 +22,7 @@
|
||||
#include <jansson.h>
|
||||
#include <gnunet/gnunet_json_lib.h>
|
||||
#include "taler_crypto_lib.h"
|
||||
#include "taler_util.h"
|
||||
#include "taler_wire_lib.h"
|
||||
#include "taler_signatures.h"
|
||||
|
||||
@ -51,6 +52,7 @@ static char *output_filename;
|
||||
*/
|
||||
static int global_ret;
|
||||
|
||||
|
||||
/**
|
||||
* Main function that will be run.
|
||||
*
|
||||
@ -211,6 +213,10 @@ main (int argc,
|
||||
GNUNET_GETOPT_OPTION_END
|
||||
};
|
||||
|
||||
/* force linker to link against libtalerutil; if we do
|
||||
not do this, the linker may "optimize" libtalerutil
|
||||
away and skip #TALER_OS_init(), which we do need */
|
||||
(void) TALER_project_data_default ();
|
||||
GNUNET_assert (GNUNET_OK ==
|
||||
GNUNET_log_setup ("taler-exchange-wire",
|
||||
"WARNING",
|
||||
|
@ -110,4 +110,11 @@ TALER_config_get_denom (const struct GNUNET_CONFIGURATION_Handle *cfg,
|
||||
struct TALER_Amount *denom);
|
||||
|
||||
|
||||
/**
|
||||
* Return default project data used by Taler.
|
||||
*/
|
||||
const struct GNUNET_OS_ProjectData *
|
||||
TALER_project_data_default (void);
|
||||
|
||||
|
||||
#endif
|
||||
|
@ -39,6 +39,7 @@ static const struct GNUNET_OS_ProjectData taler_pd = {
|
||||
.bug_email = "taler@gnu.org",
|
||||
.homepage = "http://www.gnu.org/s/taler/",
|
||||
.config_file = "taler.conf",
|
||||
.user_config_file = "~/.config/taler.conf",
|
||||
};
|
||||
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user