aboutsummaryrefslogtreecommitdiff
path: root/cmd
diff options
context:
space:
mode:
authorChristine Dodrill <me@christine.website>2018-07-01 20:36:09 +0000
committerChristine Dodrill <me@christine.website>2018-07-01 20:36:09 +0000
commit920c0d303f9bce6207e221726bbacaa2022b540a (patch)
treeed26794d6eca41f004531e1a007d2a308635640e /cmd
parent599712fab9127013e2d89dadabd839c847730637 (diff)
downloadxesite-920c0d303f9bce6207e221726bbacaa2022b540a.tar.xz
xesite-920c0d303f9bce6207e221726bbacaa2022b540a.zip
fix build
Diffstat (limited to 'cmd')
-rw-r--r--cmd/site/main.go14
1 files changed, 4 insertions, 10 deletions
diff --git a/cmd/site/main.go b/cmd/site/main.go
index e0cc20d..bad297e 100644
--- a/cmd/site/main.go
+++ b/cmd/site/main.go
@@ -12,7 +12,6 @@ import (
"sync"
"time"
- "github.com/GeertJohan/go.rice"
"github.com/Xe/jsonfeed"
"github.com/Xe/ln"
"github.com/gorilla/feeds"
@@ -135,17 +134,12 @@ func Build() (*Site, error) {
sort.Sort(sort.Reverse(s.Posts))
- cb, err := rice.FindBox("css")
+ resumeData, err := ioutil.ReadFile("./static/resume/resume.md")
if err != nil {
return nil, err
}
- sb, err := rice.FindBox("static")
- if err != nil {
- return nil, err
- }
-
- s.Resume = template.HTML(blackfriday.Run(sb.MustBytes("resume/resume.md")))
+ s.Resume = template.HTML(blackfriday.Run(resumeData))
for _, item := range s.Posts {
itime, _ := time.Parse("2006-01-02", item.Date)
@@ -174,8 +168,8 @@ func Build() (*Site, error) {
s.mux.HandleFunc("/blog.atom", s.createAtom)
s.mux.HandleFunc("/blog.json", s.createJsonFeed)
s.mux.HandleFunc("/blog/", s.showPost)
- s.mux.Handle("/static/", http.StripPrefix("/static/", http.FileServer(sb.HTTPBox())))
- s.mux.Handle("/css/", http.StripPrefix("/css/", http.FileServer(cb.HTTPBox())))
+ s.mux.Handle("/css/", http.FileServer(http.Dir(".")))
+ s.mux.Handle("/static/", http.FileServer(http.Dir(".")))
return s, nil
}