Преглед на файлове

change slot github to github-pages, add github-pages to single-site.coleslawrc

Do Nhat Minh преди 12 години
родител
ревизия
55613d717f
променени са 5 файла, в които са добавени 6 реда и са изтрити 4 реда
  1. 1 0
      README.md
  2. 1 0
      examples/single-site.coleslawrc
  3. 2 2
      src/coleslaw.lisp
  4. 1 1
      src/config.lisp
  5. 1 1
      src/indices.lisp

+ 1 - 0
README.md

15
 * Markdown Support with Code Highlighting provided by [colorize](http://www.cliki.net/colorize).
15
 * Markdown Support with Code Highlighting provided by [colorize](http://www.cliki.net/colorize).
16
   * Currently supports: Common Lisp, Emacs Lisp, Scheme, C, C++, Java, Python, Erlang, Haskell, Obj-C, Diff.
16
   * Currently supports: Common Lisp, Emacs Lisp, Scheme, C, C++, Java, Python, Erlang, Haskell, Obj-C, Diff.
17
 * [Multi-site publishing](http://blub.co.za/posts/Adding-multi-site-support-to-Coleslaw.html) support.
17
 * [Multi-site publishing](http://blub.co.za/posts/Adding-multi-site-support-to-Coleslaw.html) support.
18
+* Github's pages support
18
 
19
 
19
 * A [Plugin API](http://github.com/redline6561/coleslaw/blob/master/docs/plugin-api.md) and [plugins](http://github.com/redline6561/coleslaw/blob/master/docs/plugin-use.md) for...
20
 * A [Plugin API](http://github.com/redline6561/coleslaw/blob/master/docs/plugin-api.md) and [plugins](http://github.com/redline6561/coleslaw/blob/master/docs/plugin-use.md) for...
20
   * Comments via Disqus
21
   * Comments via Disqus

+ 1 - 0
examples/single-site.coleslawrc

1
 (:author "Brit Butler"
1
 (:author "Brit Butler"
2
  :deploy "/home/git/blog/"
2
  :deploy "/home/git/blog/"
3
  :domain "http://blog.redlinernotes.com"
3
  :domain "http://blog.redlinernotes.com"
4
+ :github-pages nil
4
  :feeds ("lisp")
5
  :feeds ("lisp")
5
  :plugins ((mathjax)
6
  :plugins ((mathjax)
6
            (disqus :shortname "my-site-name")
7
            (disqus :shortname "my-site-name")

+ 2 - 2
src/coleslaw.lisp

51
       (when (probe-file dir)
51
       (when (probe-file dir)
52
         (run-program "cp -R ~a ." dir)))
52
         (run-program "cp -R ~a ." dir)))
53
     (do-ctypes (publish ctype))
53
     (do-ctypes (publish ctype))
54
-    (render-indices (not (github *config*)))
54
+    (render-indices (not (github-pages *config*)))
55
     (render-feeds (feeds *config*))))
55
     (render-feeds (feeds *config*))))
56
 
56
 
57
 (defgeneric deploy (staging)
57
 (defgeneric deploy (staging)
63
            (curr (rel-path dest ".curr")))
63
            (curr (rel-path dest ".curr")))
64
       (ensure-directories-exist new-build)
64
       (ensure-directories-exist new-build)
65
       (run-program "mv ~a ~a" staging new-build)
65
       (run-program "mv ~a ~a" staging new-build)
66
-      (when (github *config*)
66
+      (when (github-pages *config*)
67
         (let ((cname-filename (rel-path "" "~a/CNAME" new-build))
67
         (let ((cname-filename (rel-path "" "~a/CNAME" new-build))
68
               (stripped-url (puri:uri-host (puri:parse-uri
68
               (stripped-url (puri:uri-host (puri:parse-uri
69
                                             (domain *config*)))))
69
                                             (domain *config*)))))

+ 1 - 1
src/config.lisp

5
    (deploy :initarg :deploy :initform nil :accessor deploy)
5
    (deploy :initarg :deploy :initform nil :accessor deploy)
6
    (domain :initarg :domain :initform "" :accessor domain)
6
    (domain :initarg :domain :initform "" :accessor domain)
7
    (feeds :initarg :feeds :initform nil :accessor feeds)
7
    (feeds :initarg :feeds :initform nil :accessor feeds)
8
-   (github :initarg :github :initform nil :accessor github)
8
+   (github-pages :initarg :github-pages :initform nil :accessor github-pages)
9
    (license :initarg :license :initform nil :accessor license)
9
    (license :initarg :license :initform nil :accessor license)
10
    (plugins :initarg :plugins :initform nil :accessor plugins)
10
    (plugins :initarg :plugins :initform nil :accessor plugins)
11
    (repo :initarg :repo :initform #p"/" :accessor repo)
11
    (repo :initarg :repo :initform #p"/" :accessor repo)

+ 1 - 1
src/indices.lisp

83
                                  :prev (and (plusp i) i)
83
                                  :prev (and (plusp i) i)
84
                                  :next (and (< (* (1+ i) 10) (length results))
84
                                  :next (and (< (* (1+ i) 10) (length results))
85
                                             (+ 2 i)))))))
85
                                             (+ 2 i)))))))
86
-  (if make-symlink
86
+  (if make-symlink-p
87
     (update-symlink "index.html" "1.html")
87
     (update-symlink "index.html" "1.html")
88
     (run-program "cp 1.html index.html")))
88
     (run-program "cp 1.html index.html")))