cli menu stuff

1 files changed, 9 insertions, 11 deletions

diff --git a/build-app.lisp b/build-app.lisp
index c481352..bfd3dd6 100644
--- a/build-app.lisp
+++ b/build-app.lisp
@@ -27,7 +27,7 @@ my1337pw.")
 ;;; CLON SYNOPSIS DEFINITION 
 
 (defsynopsis (:postfix "[TAGS ...] | N [ARGS ...]")
-  (group (:header "SEARCH")
+  (group (:header "SEARCH OPTIONS")
          (text :contents "Return oneliners tagged with all of TAGS")
          (lispobj :long-name "limit" 
                   :argument-type :optional
@@ -47,7 +47,7 @@ my1337pw.")
                  :argument-name "REGEX"
                  :description "A regular expression that must match some portion of the oneliner's title."))
   (text :contents " ")
-  (group (:header "RUNNING ONELINERS")
+  (group (:header "ONELINER EXECUTION OPTIONS")
          (text :contents "Runs the Nth search result with possible arguments ARGS.")
          (flag :long-name "clip"
                :description "Put oneliner into clipboard instead of running it.")
@@ -56,19 +56,18 @@ my1337pw.")
                   :argument-name "SECONDS"
                   :default-value 1.0
                   :typespec 'float 
-                  :description "How long to wait for output before giving up."))
+                  :description "How long to wait for output before giving up. Make longer if you dont see any output."))
   (text :contents " ")
-  (group (:header "Help")
+  (group (:header "HELP OPTIONS")
          (flag :long-name "explain"
                :description "View oneliner explaination text.")
-         (flag :long-name "help" 
-               :description "Print this help menu.")
-         (enum :long-name "help-topic"
+         (enum :long-name "help"
                :enum '(:access :wiki :invites)
                :argument-name "TOPIC"
                :description "Print help for a topic. 
 Topics:  wiki, access, invites"))
   (group (:header "Wiki" :hidden t)
+         (text :contents "Options For Managing Oneliners")
          (flag :long-name "add"
                :description  "Intaractively add a oneliner and update the wiki.")
          (flag :long-name "edit"
@@ -82,6 +81,7 @@ Topics:  wiki, access, invites"))
          (flag :long-name "unlock"
                :description "If you have admin priviliges, unlock a oneliner."))
   (group (:header "Access" :hidden t)
+         (text :contents "Options for Managing Access Tokens and Contributor Your Account")
          (flag :long-name "login"
                :description "Attempt to login to your contributor account. ARGS are interpreted as USERNAME PASSWORD.")
          (flag :long-name "logout"
@@ -89,6 +89,7 @@ Topics:  wiki, access, invites"))
          (flag :long-name "change-password"
                :description "Change your password. ARGS are interpreted as CURRENTPW NEWPW NEWPWAGAIN"))
   (group (:header "Invites" :hidden t)
+         (text :contents "Options For Making Invite and Redeeming Tokens")
          (flag :long-name "invite"
                :description "Request an invite token to send to a friend.")
          (flag :long-name "redeem"
@@ -113,10 +114,7 @@ than the users."
 (defun main ()
   "Entry point for our standalone application."
   (make-context)
-  (when (getopt :long-name "help")
-    (help )
-    (uiop:quit))
-  (a:when-let (topic (getopt :long-name "help-topic"))
+  (a:when-let (topic (getopt :long-name "help"))
     (help :item (find-group-with-header (symbol-name topic)))
     (uiop:quit))
   (handler-case