From 18e6099230c3bfe23d4faeeae289554f127deb87 Mon Sep 17 00:00:00 2001
From: gramanas <anastasis.gramm2@gmail.com>
Date: Fri, 19 Oct 2018 13:06:27 +0300
Subject: Add install script and config/verbose help

---
 src/actionhelper.c | 21 +++++++++++++++++++++
 src/actionhelper.h |  3 +++
 src/actionparser.c |  2 +-
 src/actions.c      | 10 ++++++++++
 4 files changed, 35 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/actionhelper.c b/src/actionhelper.c
index 6507e7b..6e76b2b 100644
--- a/src/actionhelper.c
+++ b/src/actionhelper.c
@@ -398,3 +398,24 @@ void print_HELP_help() {
   ckhelp("Note:\nRunning ck without arguments will print all the available actions.");
   report_help();
 }
+
+void print_conf_help(void) {
+  ckhelp("Set a different ck configuration directory.\n");
+  ckhelp("This has to be passed before any action or action argument");
+  ckhelp("and after verbose (if set).\n");
+  ckhelp("Usage:");
+  ckhelp("  ck -c /path/to/conf ...");
+  ckhelp("  ck config /path/to/conf ...\n");
+  ckhelp("ck will use the database and config file in the path supplied");
+  ckhelp("to perform any actions.\n");
+  ckhelp("Tip:\nYou can alias `ck -c /path/to/conf` and use the new alias");
+  ckhelp("to organise a different set of configurations, or some custom scrpits.");
+  report_help();
+}
+
+void print_verbose_help(void) {
+  ckhelp("WIP\n");
+  ckhelp("Currently passing the verbose flag, prints a log of what ck is doing");
+  ckhelp("during excecution of an action.");
+  report_help();
+}
diff --git a/src/actionhelper.h b/src/actionhelper.h
index eb544ce..bfe0b85 100644
--- a/src/actionhelper.h
+++ b/src/actionhelper.h
@@ -62,4 +62,7 @@ extern ListOpt list_make_options(cklist *args);
 CK_ACTIONS
 #undef X
 
+extern void print_conf_help(void);
+extern void print_verbose_help(void);
+
 #endif /* ACTIONHELPER_H */
diff --git a/src/actionparser.c b/src/actionparser.c
index aee9732..7ee46fe 100644
--- a/src/actionparser.c
+++ b/src/actionparser.c
@@ -24,7 +24,7 @@ const char* const strEDIT[]     = {"3", "edit",   "e",  "-e"};
 const char* const strLIST[]     = {"5", "list",   "ls", "l",  "-l", "-ls"};
 const char* const strSEARCH[]   = {"4", "search", "grep", "s",  "-s"};
 const char* const strHELP[]     = {"5", "help",   "h",  "-?", "-h", "--help"};
-const char* const strConfDir[]  = {"4", "config", "conf", "c", "-c"};
+const char* const strConfDir[]  = {"2", "config", "-c"};
 const char* const strVersion[]  = {"2", "version", "--version"};
 const char* const strVerbose1[] = {"2", "--verbose", "-v"};
 const char* const strVerbose2[] = {"2", "--Verbose", "-V"};
diff --git a/src/actions.c b/src/actions.c
index 417f9ce..fcdf308 100644
--- a/src/actions.c
+++ b/src/actions.c
@@ -281,6 +281,16 @@ int run_HELP(UserOpt *opt, Conf *conf) {
     return 0;
   }
 
+  if (strcmp(list_get(opt->args), "config") == 0) {
+    print_conf_help();
+    return 0;
+  }
+
+  if (strcmp(list_get(opt->args), "verbose") == 0) {
+    print_verbose_help();
+    return 0;
+  }
+
   switch(parser_get_action(list_get(opt->args), NULL)) {
 #define X(ACTION)                                               \
     case CKA_##ACTION:                                          \
-- 
cgit v1.2.3