~ chicken-core (chicken-5) 99c1e5aa8b46b2026141cec5cb281632a6c67b6f
commit 99c1e5aa8b46b2026141cec5cb281632a6c67b6f Author: Evan Hanson <evhan@foldling.org> AuthorDate: Mon Feb 22 14:04:40 2016 +1300 Commit: Peter Bex <peter@more-magic.net> CommitDate: Wed Feb 24 21:01:21 2016 +0100 Print "chicken-install -repository" after processing all arguments Without this, the sanity check that requires a prefix to be given when the "-deploy" option is used is never triggered, and running the command "chicken-install -deploy -repository" just prints "#f". Signed-off-by: Peter Bex <peter@more-magic.net> diff --git a/chicken-install.scm b/chicken-install.scm index 67088a97..2ddd30a8 100644 --- a/chicken-install.scm +++ b/chicken-install.scm @@ -867,6 +867,7 @@ EOF (let ((update #f) (scan #f) (listeggs #f) + (print-repository #f) (rx (irregex "([^:]+):(.+)"))) (setup-proxy (get-environment-variable "http_proxy")) (let loop ((args args) (eggs '())) @@ -875,7 +876,8 @@ EOF (unless *prefix* (error "`-deploy' only makes sense in combination with `-prefix DIRECTORY`"))) - (cond (update (update-db)) + (cond (print-repository (print (repo-path))) + (update (update-db)) (scan (scan-directory scan)) (else (let ((defaults (load-defaults))) @@ -928,8 +930,8 @@ EOF (string=? arg "--help")) (usage 0)) ((string=? arg "-repository") - (print (repo-path)) - (exit 0)) + (set! print-repository #t) + (loop (cdr args) eggs)) ((string=? arg "-force") (set! *force* #t) (loop (cdr args) eggs))Trap