Просмотр исходного кода

Set blog repo in "the right place".

Brit Butler лет назад: 10
Родитель
Сommit
ed886b57e7
2 измененных файлов с 3 добавлено и 3 удалено
  1. 1 2
      src/coleslaw.lisp
  2. 2 1
      src/config.lisp

+ 1 - 2
src/coleslaw.lisp

@@ -7,8 +7,7 @@
7 7
   "Load the user's config file, then compile and deploy the blog stored
8 8
 in REPO-DIR. Optionally, OLDREV is the revision prior to the last push."
9 9
   (load-config repo-dir)
10
-  (setf (repo *config*) repo-dir
11
-        *last-revision* oldrev)
10
+  (setf *last-revision* oldrev)
12 11
   (load-content)
13 12
   (compile-theme (theme *config*))
14 13
   (let ((dir (staging-dir *config*)))

+ 2 - 1
src/config.lisp

@@ -66,5 +66,6 @@ doesn't exist, use the .coleslawrc in the home directory."
66 66
 preferred over the home directory if provided."
67 67
   (with-open-file (in (discover-config-path repo-dir) :external-format '(:utf-8))
68 68
     (let ((config-form (read in)))
69
-      (setf *config* (construct 'blog config-form))))
69
+      (setf *config* (construct 'blog config-form)
70
+            (repo *config*) repo-dir)))
70 71
   (load-plugins (plugins *config*)))