Better default configuration parameters handling.
This commit is contained in:
parent
6cf116ce98
commit
9576a24ebb
2 changed files with 38 additions and 34 deletions
|
@ -60,13 +60,6 @@
|
|||
(define -send-emails- (make-parameter #f))
|
||||
(define -quiet- (make-parameter #f))
|
||||
|
||||
;; Configuration overrides
|
||||
(define =members-directory= (make-parameter #f))
|
||||
(define =apikeys-file= (make-parameter #f))
|
||||
(define =jendasap-checked= (make-parameter #f))
|
||||
(define =bank-dir= (make-parameter #f))
|
||||
(define =email-from= (make-parameter #f))
|
||||
|
||||
;; Arguments parsing
|
||||
(command-line
|
||||
print-help
|
||||
|
@ -86,18 +79,18 @@
|
|||
(-config (fname) "Initial configuration"
|
||||
(*etc-hackerbase* fname))
|
||||
(-members (dir) "Members base directory"
|
||||
(=members-directory= dir))
|
||||
(*members-directory* dir))
|
||||
(-month (YYYY-MM) "Specify current month"
|
||||
(-normal-month- #f)
|
||||
(*current-month* (string->month YYYY-MM)))
|
||||
(-tstyle (style) "Use given table style: debug, ascii, unicode"
|
||||
(*table-border-style* (string->symbol style)))
|
||||
(-apikey (fname) "File with Fio API keys"
|
||||
(=apikeys-file= fname))
|
||||
(*apikeys-file* fname))
|
||||
(-bankdir (dir) "Where are bank CSV files"
|
||||
(=bank-dir= dir))
|
||||
(*bank-dir* dir))
|
||||
(-checked (file) "JendaSAP checked.ntlm file"
|
||||
(=jendasap-checked= file))
|
||||
(*jendasap-checked* file))
|
||||
(-ml-all () "Load all mailman lists"
|
||||
(-ml-all- #t))
|
||||
(-destroyed () "Show destroyed members in -fees"
|
||||
|
@ -112,7 +105,7 @@
|
|||
(-quiet- #t)
|
||||
(*progress-quiet* #t))
|
||||
(-from (email) "Sender email address"
|
||||
(=email-from= email))
|
||||
(*email-from* email))
|
||||
""
|
||||
"Query options:"
|
||||
(-mi (id) "Specify member by id" (-member-id- (string->number id)))
|
||||
|
@ -176,18 +169,6 @@
|
|||
;; Load default configuration
|
||||
(load-configuration!)
|
||||
|
||||
;; Override from command-line
|
||||
(when (=members-directory=)
|
||||
(*members-directory* (=members-directory=)))
|
||||
(when (=apikeys-file=)
|
||||
(*apikeys-file* (=apikeys-file=)))
|
||||
(when (=jendasap-checked=)
|
||||
(*jendasap-checked* (=jendasap-checked=)))
|
||||
(when (=bank-dir=)
|
||||
(*bank-dir* (=bank-dir=)))
|
||||
(when (=email-from=)
|
||||
(*email-from* (=email-from=)))
|
||||
|
||||
;; Run tests
|
||||
(when (-run-tests?-)
|
||||
(run-all-tests!)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue