Code cleanup

This commit is contained in:
James Mills 2021-10-29 02:10:15 +10:00
parent 40012efba4
commit 2ab171a0d4
No known key found for this signature in database
GPG Key ID: AC4C014F1440EBD6
3 changed files with 6 additions and 6 deletions

3
.gitignore vendored
View File

@ -1,6 +1,7 @@
*~ *~
*.bak *.bak
**.pub
/zs /zs
/.pub
/dist /dist
/test.md

View File

@ -33,9 +33,8 @@ func renameExt(path, oldext, newext string) string {
} }
if oldext == "" || strings.HasSuffix(path, oldext) { if oldext == "" || strings.HasSuffix(path, oldext) {
return strings.TrimSuffix(path, oldext) + newext return strings.TrimSuffix(path, oldext) + newext
} else {
return path
} }
return path
} }
// globals returns list of global OS environment variables that start // globals returns list of global OS environment variables that start
@ -169,7 +168,7 @@ func render(s string, vars Vars) (string, error) {
} }
} }
} }
return s, nil
} }
// Renders markdown with the given layout into html expanding all the macros // Renders markdown with the given layout into html expanding all the macros

View File

@ -55,7 +55,7 @@ foo: bar
title: Hello, world! title: Hello, world!
--- ---
Some content in markdown Some content in markdown
`: Vars{ `: {
"foo": "bar", "foo": "bar",
"title": "Hello, world!", "title": "Hello, world!",
"url": "test.html", "url": "test.html",
@ -67,7 +67,7 @@ Some content in markdown
url: "example.com/foo.html" url: "example.com/foo.html"
--- ---
Hello Hello
`: Vars{ `: {
"url": "example.com/foo.html", "url": "example.com/foo.html",
"__content": "Hello\n", "__content": "Hello\n",
}, },