From 53db54e71da298fca37e5ae10ca8295ba33af441 Mon Sep 17 00:00:00 2001
From: Tom Willemse
Date: Sun, 2 Mar 2014 00:12:58 +0100
Subject: Extract RC loading from main

---
 gitto/main.scm | 32 ++++++++++++++++++--------------
 1 file changed, 18 insertions(+), 14 deletions(-)

(limited to 'gitto')

diff --git a/gitto/main.scm b/gitto/main.scm
index d790200..3a2a5b7 100644
--- a/gitto/main.scm
+++ b/gitto/main.scm
@@ -52,6 +52,15 @@
   (for-each print-repository-location
             (sort repositories repository-location<?)))
 
+(define (load-rc)
+  "Load the RC file for user customizations."
+  (let ((cfg (config-file "rc.scm")))
+    (when (file-exists? cfg)
+      (save-module-excursion
+       (lambda ()
+         (set-current-module (resolve-module '(gitto main)))
+         (primitive-load cfg))))))
+
 (define (maybe-install-hooks. repo)
   "Install hooks for REPO unless it's excluded."
   (unless (member (repo-name repo) config-exclusion-list)
@@ -273,17 +282,12 @@ Displays version and some copyright information."
 
 (define (main args)
   "Parse the command line options and run the appropriate functions."
-  (let ((cfg (config-file "rc.scm")))
-    (when (file-exists? cfg)
-      (save-module-excursion
-       (lambda ()
-         (set-current-module (resolve-module '(gitto main)))
-         (primitive-load cfg))))
-
-    (let* ((command-spec (cdr (member "gitto" args string-suffix?)))
-           (command-specified? (not (eq? command-spec '())))
-           (command (car (if command-specified? command-spec '("list")))))
-      (if (command? command)
-          (apply (command-function command)
-                 (if command-specified? (cdr command-spec) '()))
-          (format #t "Unknown command: ~a~%" (car command-spec))))))
+  (load-rc)
+
+  (let* ((command-spec (cdr (member "gitto" args string-suffix?)))
+         (command-specified? (not (eq? command-spec '())))
+         (command (car (if command-specified? command-spec '("list")))))
+    (if (command? command)
+        (apply (command-function command)
+               (if command-specified? (cdr command-spec) '()))
+        (format #t "Unknown command: ~a~%" (car command-spec)))))
-- 
cgit v1.2.3-54-g00ecf