X-Git-Url: http://47.100.26.94:8080/?a=blobdiff_plain;ds=inline;f=my-publish.el;h=2ff77bce166719892580189be6a215e26bf0a531;hb=50a02bc7a618f1a652c524d72a1a3b205e96f35e;hp=984bb11ad9c263a22f60c20a774fad744c16ae1a;hpb=2f98df72c926b951cab2310c1fbf4442d4535bec;p=blog.git
diff --git a/my-publish.el b/my-publish.el
index 984bb11..2ff77bc 100644
--- a/my-publish.el
+++ b/my-publish.el
@@ -45,9 +45,9 @@
"
"
"
"
""
""))
@@ -59,11 +59,14 @@ License: CC BY-SA 4
(defun blog-setup-project-alist (root-dir &optional output-dir)
"Set project alist. `output-dir' is the directory of publish-directory.
`root-dir' is the root directory of blog repository."
- (unless output-dir (setq output-dir (concat root-dir "_site/")))
+ (unless (> (length output-dir) 0)
+ (setq output-dir (concat root-dir "/_site/")))
+ (message "Blog dir is: %s\nOut dir is: %s"
+ (format root-dir)
+ (format output-dir))
(setq org-publish-project-alist
`(
("blog-pages"
- ;; publishing
:base-directory ,root-dir
:base-extension "org"
:publishing-directory ,output-dir
@@ -85,7 +88,6 @@ License: CC BY-SA 4
:html-postamble ,blog-footer)
("blog-posts"
- ;; publishing
:base-directory ,(concat root-dir "/posts")
:base-extension "org"
:publishing-directory ,(concat output-dir "/posts")
@@ -125,13 +127,5 @@ License: CC BY-SA 4
:recursive t)
("blog" :components ("blog-pages" "blog-posts" "blog-css" "blog-cgi")))))
-
-(defun blog-publish (out-dir force)
- "publish the project"
- (interactive)
- (blog-setup-project out-dir)
- (org-publish-project "blog" force))
-
-
(provide 'my-publish)
;;; publish.el ends here