Refactor usage

1 files changed, 17 insertions, 10 deletions

@@ -364,19 +364,26 @@ boudin --- a little static site generator
 
 ;;; Options & Operands (SRFI 37)
 
+(define (die error-code message . args)
+  (with-output-to-port (current-error-port)
+    (apply print message args)
+    (exit error-code)))
+
+(define usage #<<END
+Usage: boudin [OPTIONS]
+Options:
+-h, --help               show this help and exit
+-C dir, --directory dir  build site in DIR instead of current directory
+END
+)
+
 (define opt/help
   (option '(#\h "help")                 ; Names
           #f                            ; Required arg?
           #f                            ; Optional arg?
           (lambda _                          ; Option proc (opt name arg seeds ...)
             (with-output-to-port (current-error-port)
-              (lambda ()
-                (print "Usage: boudin [OPTIONS]\n"
-                       "Options:\n"
-                       "-h, --help     show this help and exit\n"
-                       "-C dir, --directory dir\n"
-                       "     build site in DIR instead of current directory"
-                       )))
+              (lambda () (print usage)))
             (exit))))
 
 (define opt/directory
@@ -394,10 +401,10 @@ boudin --- a little static site generator
                    opt/directory)
              ;; Unrecognized option proc (option name arg seeds ...)
              (lambda (_ name _ _)
-               (error "Unrecognized option" name))
+               (die 1 "Unrecognized option: -" name "\n" usage))
              ;; Operand proc (operand seeds ...)
              (lambda (name _)
-               (error "Bad operand" name))
+               (die 1 "Unrecognized operand: " name "\n" usage))
              ;; Seeds
              '()))
 
@@ -405,7 +412,7 @@ boudin --- a little static site generator
 
 (define (main args)
   (process-args args)
-
+  ;; TODO ...
   #f)
 
 (cond-expand