diff --git a/main.go b/main.go index 54cd430..4c91f6b 100644 --- a/main.go +++ b/main.go @@ -17,7 +17,7 @@ import ( "strings" ) -const VERSION = "v5" +const VERSION = "v2" var ( flagVerbose bool @@ -49,11 +49,7 @@ func main() { http.HandleFunc("/sites", actionSites) log.Println("Listen on [::]:5123") - err := http.ListenAndServe("[::]:5123", nil) - if err != nil { - log.Println(err) - os.Exit(1) - } + http.ListenAndServe("[::]:5123", nil) } func replaceTilde(str string) string { // {{{ @@ -73,7 +69,10 @@ func replaceTilde(str string) string { // {{{ func pageIndex(w http.ResponseWriter, r *http.Request) { // {{{ var tmpl *template.Template var err error - tmpl, err = template.ParseFS(fs, "static/html/index.html") + if false { + tmpl, err = template.ParseFS(fs, "static/html/index.html") + } + tmpl, err = template.ParseFiles("static/html/index.html") if err != nil { w.Write([]byte(err.Error())) return @@ -88,7 +87,8 @@ func pageIndex(w http.ResponseWriter, r *http.Request) { // {{{ func pageCSS(w http.ResponseWriter, r *http.Request) { // {{{ w.Header().Add("Content-Type", "text/css") - data, err := fs.ReadFile("static/css/main.css") + //data, err := fs.ReadFile("static/css/main.css") + data, err := os.ReadFile("static/css/main.css") if err != nil { w.Write([]byte(err.Error())) return