From 257756f811e7e7dbab06f656f89fb59d1b5f2382 Mon Sep 17 00:00:00 2001 From: Peter Bex Date: Sun, 20 Mar 2011 00:33:54 +0100 Subject: Fix commandline argument handling --- henrietta-cache.scm | 24 +++--------------------- 1 file changed, 3 insertions(+), 21 deletions(-) (limited to 'henrietta-cache.scm') diff --git a/henrietta-cache.scm b/henrietta-cache.scm index 1e04b92..f1efe54 100644 --- a/henrietta-cache.scm +++ b/henrietta-cache.scm @@ -104,6 +104,8 @@ EOF (else (collect-releases (cdr info) uris/releases uris))))))) (call-with-input-file *egg-list* read-file))) +(define *short-options* '(#\h #\c #\e)) + (define (main args) (let loop ((args args)) (if (null? args) @@ -115,32 +117,12 @@ EOF (usage 0)) ((or (string=? arg "-c") (string=? arg "-cache-dir")) (unless (pair? (cdr args)) (usage 1)) - (set! *cache-dir* (cadr args)) - (loop (cddr args))) - ((or (string=? arg "-t") (string=? arg "-transport")) - (unless (pair? (cdr args)) (usage 1)) - (set! *default-transport* (string->symbol (cadr args))) + (set! *cache-directory* (cadr args)) (loop (cddr args))) ((or (string=? arg "-e") (string=? arg "-egg-list")) (unless (pair? (cdr args)) (usage 1)) (set! *egg-list* (string->symbol (cadr args))) (loop (cddr args))) - ((string=? "-username" arg) - (unless (pair? (cdr args)) (usage 1)) - (set! *username* (cadr args)) - (loop (cddr args))) - ((string=? "-password" arg) - (unless (pair? (cdr args)) (usage 1)) - (set! *password* (cadr args)) - (loop (cddr args))) - ((string=? "-query" arg) - (unless (pair? (cdr args)) (usage 1)) - (set! *query-string* (cadr args)) - (loop (cddr args))) - ((string=? "-remote" arg) - (unless (pair? (cdr args)) (usage 1)) - (set! *remote-addr* (cadr args)) - (loop (cddr args))) ((and (positive? (string-length arg)) (char=? #\- (string-ref arg 0))) (if (> (string-length arg) 2) -- cgit v1.2.3