RECLAIM: improve help

diff --git a/src/Makefile.am b/src/Makefile.am
index c1c708aa6ecb02e4375cf37d45b84af0a7ef6420..b16792e15aa1c752ecdc64630ba1521e4c6e620d 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -11,19 +11,17 @@ endif
 
 if HAVE_EXPERIMENTAL
  EXP_DIR = \
-  rps
+  rps \
+  credential \
+  reclaim-attribute \
+  reclaim
 if HAVE_ABE
-if HAVE_JSON
  EXP_DIR += \
-    abe \
-    credential \
-    reclaim-attribute \
-    reclaim
-endif
+  abe \
 endif
 if HAVE_JSON
  EXP_DIR += \
-    auction
+  auction
 endif
 endif
 

diff --git a/src/reclaim/Makefile.am b/src/reclaim/Makefile.am
index bea8cd38e963959549f7dc849c5fcf678bd36e32..210759fcecd25a9d1604c62c1648589e9980faab 100644 (file)
--- a/src/reclaim/Makefile.am
+++ b/src/reclaim/Makefile.am
@@ -99,7 +99,7 @@ libgnunet_plugin_reclaim_sqlite_la_LIBADD = \
   libgnunetreclaim.la  \
   $(top_builddir)/src/sq/libgnunetsq.la \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
-       $(top_builddir)/src/reclaim-attribute/libgnunetreclaimattribute.la \
+  $(top_builddir)/src/reclaim-attribute/libgnunetreclaimattribute.la \
   $(top_builddir)/src/util/libgnunetutil.la $(XLIBS) -lsqlite3 \
   $(LTLIBINTL)
 libgnunet_plugin_reclaim_sqlite_la_LDFLAGS = \
@@ -126,26 +126,26 @@ libgnunetreclaim_la_SOURCES = \
  reclaim.h
 libgnunetreclaim_la_LIBADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
-       $(top_builddir)/src/reclaim-attribute/libgnunetreclaimattribute.la \
-       $(GN_LIBINTL) $(XLIB)
+  $(top_builddir)/src/reclaim-attribute/libgnunetreclaimattribute.la \
+  $(GN_LIBINTL) $(XLIB)
 libgnunetreclaim_la_LDFLAGS = \
-       $(GN_LIB_LDFLAGS)  $(WINFLAGS) \
-       -version-info 0:0:0
+  $(GN_LIB_LDFLAGS)  $(WINFLAGS) \
+  -version-info 0:0:0
 
 gnunet_reclaim_SOURCES = \
  gnunet-reclaim.c
 gnunet_reclaim_LDADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
-       $(top_builddir)/src/namestore/libgnunetnamestore.la \
-       libgnunetreclaim.la \
-       $(top_builddir)/src/identity/libgnunetidentity.la \
-       $(top_builddir)/src/reclaim-attribute/libgnunetreclaimattribute.la \
+  $(top_builddir)/src/namestore/libgnunetnamestore.la \
+  libgnunetreclaim.la \
+  $(top_builddir)/src/identity/libgnunetidentity.la \
+  $(top_builddir)/src/reclaim-attribute/libgnunetreclaimattribute.la \
   $(GN_LIBINTL)
 
 check_SCRIPTS = \
-       test_reclaim_attribute.sh \
-       test_reclaim_issue.sh \
-       test_reclaim_consume.sh \
+  test_reclaim_attribute.sh \
+  test_reclaim_issue.sh \
+  test_reclaim_consume.sh \
   test_reclaim_revoke.sh
 
 if ENABLE_TEST_RUN

diff --git a/src/reclaim/gnunet-reclaim.c b/src/reclaim/gnunet-reclaim.c
index b10586feb838b2f26d5d4f21921c2dda51114e41..df6ebc66f0cf18825b8b047e0c56e99146259718 100644 (file)
--- a/src/reclaim/gnunet-reclaim.c
+++ b/src/reclaim/gnunet-reclaim.c
@@ -505,52 +505,52 @@ main(int argc, char *const argv[])
 
     GNUNET_GETOPT_option_string ('a',
                                  "add",
-                                 NULL,
-                                 gettext_noop ("Add attribute"),
+                                 "NAME",
+                                 gettext_noop ("Add an attribute NAME"),
                                  &attr_name),
 
     GNUNET_GETOPT_option_string ('V',
                                  "value",
-                                 NULL,
-                                 gettext_noop ("Attribute value"),
+                                 "VALUE",
+                                 gettext_noop ("The attribute VALUE"),
                                  &attr_value),
     GNUNET_GETOPT_option_string ('e',
                                  "ego",
-                                 NULL,
-                                 gettext_noop ("Ego"),
+                                 "EGO",
+                                 gettext_noop ("The EGO to use"),
                                  &ego_name),
     GNUNET_GETOPT_option_string ('r',
                                  "rp",
-                                 NULL,
-                                 gettext_noop ("Audience (relying party)"),
+                                 "RP",
+                                 gettext_noop ("Specify the relying party for issue"),
                                  &rp),
     GNUNET_GETOPT_option_flag ('D',
                                "dump",
-                               gettext_noop ("List attributes for Ego"),
+                               gettext_noop ("List attributes for EGO"),
                                &list),
     GNUNET_GETOPT_option_string ('i',
                                  "issue",
-                                 NULL,
-                                 gettext_noop ("Issue a ticket"),
+                                 "A1,A2,...",
+                                 gettext_noop ("Issue a ticket for a set of attributes separated by comma"),
                                  &issue_attrs),
     GNUNET_GETOPT_option_string ('C',
                                  "consume",
-                                 NULL,
+                                 "TICKET",
                                  gettext_noop ("Consume a ticket"),
                                  &consume_ticket),
     GNUNET_GETOPT_option_string ('R',
                                  "revoke",
-                                 NULL,
+                                 "TICKET",
                                  gettext_noop ("Revoke a ticket"),
                                  &revoke_ticket),
     GNUNET_GETOPT_option_string ('t',
                                  "type",
-                                 NULL,
+                                 "TYPE",
                                  gettext_noop ("Type of attribute"),
                                  &type_str),
     GNUNET_GETOPT_option_relative_time ('E',
                                         "expiration",
-                                        NULL,
+                                        "INTERVAL",
                                         gettext_noop ("Expiration interval of the attribute"),
                                         &exp_interval),