From c69455deb43eaec2972977adaee75f397db92f86 Mon Sep 17 00:00:00 2001 From: Erik Winter Date: Thu, 30 Sep 2021 07:10:33 +0200 Subject: [PATCH] update import paths --- cmd/notes/main.go | 2 +- cmd/notes/note/note.go | 2 +- cmd/notes/note/notes.go | 2 +- cmd/ssg/main.go | 2 +- cmd/ssg/site/config.go | 2 +- cmd/ssg/site/html.go | 4 ++-- cmd/ssg/site/html_test.go | 6 +++--- cmd/ssg/site/meta.go | 2 +- cmd/ssg/site/meta_test.go | 6 +++--- cmd/ssg/site/post.go | 4 ++-- cmd/ssg/site/post_test.go | 6 +++--- cmd/ssg/site/posts_test.go | 4 ++-- cmd/ssg/site/site.go | 2 +- cmd/ssg/site/sites.go | 2 +- doc/code-walkthrough.adoc | 2 +- ...y-i-built-my-own-shitty-static-site-generator.adoc | 2 +- go.mod | 5 +---- go.sum | 11 ++++------- pkg/adoc/adoc_test.go | 4 ++-- pkg/adoc/block_test.go | 4 ++-- pkg/adoc/inline_test.go | 4 ++-- pkg/adoc/parser_test.go | 4 ++-- 22 files changed, 38 insertions(+), 44 deletions(-) diff --git a/cmd/notes/main.go b/cmd/notes/main.go index 305b0cb..ca7b06d 100644 --- a/cmd/notes/main.go +++ b/cmd/notes/main.go @@ -8,7 +8,7 @@ import ( "path/filepath" "strconv" - "git.sr.ht/~ewintr/shitty-ssg/cmd/notes/note" + "ewintr.nl/shitty-ssg/cmd/notes/note" ) func main() { diff --git a/cmd/notes/note/note.go b/cmd/notes/note/note.go index 19b7cdd..0a697d2 100644 --- a/cmd/notes/note/note.go +++ b/cmd/notes/note/note.go @@ -3,7 +3,7 @@ package note import ( "strings" - "git.sr.ht/~ewintr/shitty-ssg/pkg/adoc" + "ewintr.nl/shitty-ssg/pkg/adoc" ) type Kind string diff --git a/cmd/notes/note/notes.go b/cmd/notes/note/notes.go index fc0d018..9f9b1e6 100644 --- a/cmd/notes/note/notes.go +++ b/cmd/notes/note/notes.go @@ -3,7 +3,7 @@ package note import ( "io/ioutil" - "git.sr.ht/~ewintr/shitty-ssg/pkg/adoc" + "ewintr.nl/shitty-ssg/pkg/adoc" ) type Notes []*Note diff --git a/cmd/ssg/main.go b/cmd/ssg/main.go index ea850ab..f7b5f02 100644 --- a/cmd/ssg/main.go +++ b/cmd/ssg/main.go @@ -9,7 +9,7 @@ import ( "path/filepath" "strings" - "git.sr.ht/~ewintr/shitty-ssg/cmd/ssg/site" + "ewintr.nl/shitty-ssg/cmd/ssg/site" ) var ( diff --git a/cmd/ssg/site/config.go b/cmd/ssg/site/config.go index 7f52c4f..b15dbd8 100644 --- a/cmd/ssg/site/config.go +++ b/cmd/ssg/site/config.go @@ -6,7 +6,7 @@ import ( "path/filepath" "text/template" - "git.sr.ht/~ewintr/shitty-ssg/pkg/adoc" + "ewintr.nl/shitty-ssg/pkg/adoc" ) var ( diff --git a/cmd/ssg/site/html.go b/cmd/ssg/site/html.go index 770b3d1..354a23c 100644 --- a/cmd/ssg/site/html.go +++ b/cmd/ssg/site/html.go @@ -5,8 +5,8 @@ import ( "html" "strings" - "git.sr.ht/~ewintr/go-kit/slugify" - "git.sr.ht/~ewintr/shitty-ssg/pkg/adoc" + "ewintr.nl/go-kit/slugify" + "ewintr.nl/shitty-ssg/pkg/adoc" ) type HTMLPost struct { diff --git a/cmd/ssg/site/html_test.go b/cmd/ssg/site/html_test.go index 0ac3e3d..242c2e3 100644 --- a/cmd/ssg/site/html_test.go +++ b/cmd/ssg/site/html_test.go @@ -3,9 +3,9 @@ package site_test import ( "testing" - "git.sr.ht/~ewintr/go-kit/test" - "git.sr.ht/~ewintr/shitty-ssg/cmd/ssg/site" - "git.sr.ht/~ewintr/shitty-ssg/pkg/adoc" + "ewintr.nl/go-kit/test" + "ewintr.nl/shitty-ssg/cmd/ssg/site" + "ewintr.nl/shitty-ssg/pkg/adoc" ) func TestFormatBlock(t *testing.T) { diff --git a/cmd/ssg/site/meta.go b/cmd/ssg/site/meta.go index a798b1c..b82ca59 100644 --- a/cmd/ssg/site/meta.go +++ b/cmd/ssg/site/meta.go @@ -1,7 +1,7 @@ package site import ( - "git.sr.ht/~ewintr/shitty-ssg/pkg/adoc" + "ewintr.nl/shitty-ssg/pkg/adoc" ) const ( diff --git a/cmd/ssg/site/meta_test.go b/cmd/ssg/site/meta_test.go index a455571..1e66ffd 100644 --- a/cmd/ssg/site/meta_test.go +++ b/cmd/ssg/site/meta_test.go @@ -3,9 +3,9 @@ package site_test import ( "testing" - "git.sr.ht/~ewintr/go-kit/test" - "git.sr.ht/~ewintr/shitty-ssg/cmd/ssg/site" - "git.sr.ht/~ewintr/shitty-ssg/pkg/adoc" + "ewintr.nl/go-kit/test" + "ewintr.nl/shitty-ssg/cmd/ssg/site" + "ewintr.nl/shitty-ssg/pkg/adoc" ) func TestNewLanguage(t *testing.T) { diff --git a/cmd/ssg/site/post.go b/cmd/ssg/site/post.go index e220d04..47c7b9e 100644 --- a/cmd/ssg/site/post.go +++ b/cmd/ssg/site/post.go @@ -9,8 +9,8 @@ import ( "strings" "time" - "git.sr.ht/~ewintr/go-kit/slugify" - "git.sr.ht/~ewintr/shitty-ssg/pkg/adoc" + "ewintr.nl/go-kit/slugify" + "ewintr.nl/shitty-ssg/pkg/adoc" ) var ( diff --git a/cmd/ssg/site/post_test.go b/cmd/ssg/site/post_test.go index 9760e48..ccd2e90 100644 --- a/cmd/ssg/site/post_test.go +++ b/cmd/ssg/site/post_test.go @@ -4,9 +4,9 @@ import ( "testing" "time" - "git.sr.ht/~ewintr/go-kit/test" - "git.sr.ht/~ewintr/shitty-ssg/cmd/ssg/site" - "git.sr.ht/~ewintr/shitty-ssg/pkg/adoc" + "ewintr.nl/go-kit/test" + "ewintr.nl/shitty-ssg/cmd/ssg/site" + "ewintr.nl/shitty-ssg/pkg/adoc" ) func TestPost(t *testing.T) { diff --git a/cmd/ssg/site/posts_test.go b/cmd/ssg/site/posts_test.go index 8f9170b..956723f 100644 --- a/cmd/ssg/site/posts_test.go +++ b/cmd/ssg/site/posts_test.go @@ -4,8 +4,8 @@ import ( "testing" "time" - "git.sr.ht/~ewintr/go-kit/test" - "git.sr.ht/~ewintr/shitty-ssg/cmd/ssg/site" + "ewintr.nl/go-kit/test" + "ewintr.nl/shitty-ssg/cmd/ssg/site" ) func TestPosts(t *testing.T) { diff --git a/cmd/ssg/site/site.go b/cmd/ssg/site/site.go index 6f35b08..a0a03e6 100644 --- a/cmd/ssg/site/site.go +++ b/cmd/ssg/site/site.go @@ -5,7 +5,7 @@ import ( "os" "path/filepath" - "git.sr.ht/~ewintr/shitty-ssg/pkg/adoc" + "ewintr.nl/shitty-ssg/pkg/adoc" ) const dirMode = os.ModeDir | 0755 diff --git a/cmd/ssg/site/sites.go b/cmd/ssg/site/sites.go index f4941b7..cbf8dfe 100644 --- a/cmd/ssg/site/sites.go +++ b/cmd/ssg/site/sites.go @@ -1,6 +1,6 @@ package site -import "git.sr.ht/~ewintr/shitty-ssg/pkg/adoc" +import "ewintr.nl/shitty-ssg/pkg/adoc" var ( SITE_CONFIG_EWNL = &SiteConfig{ diff --git a/doc/code-walkthrough.adoc b/doc/code-walkthrough.adoc index e2743a9..4d26ea9 100644 --- a/doc/code-walkthrough.adoc +++ b/doc/code-walkthrough.adoc @@ -17,7 +17,7 @@ Originally I made the SSG to create one site. But it turned out to be not that h In the future I might add an export for a Gopher or a Gemini site and if the collection of notes grows I’ll probably improve the search somewhat. Now it only finds notes on tags or whole words. It displays them just in plain text. I will also probably dive more into shell escape codes and such to see if the apperance can be improved. -The code itself can be found https://git.sr.ht/~ewintr/shitty-ssg[here]. +The code itself can be found https://ewintr.nl/shitty-ssg[here]. == Directories diff --git a/doc/why-i-built-my-own-shitty-static-site-generator.adoc b/doc/why-i-built-my-own-shitty-static-site-generator.adoc index 9d8db5a..3f88833 100644 --- a/doc/why-i-built-my-own-shitty-static-site-generator.adoc +++ b/doc/why-i-built-my-own-shitty-static-site-generator.adoc @@ -82,4 +82,4 @@ So, my advise is to be aware of the restrictions and the hidden models of the to In the title, I mention that my generator is “shitty” and it is. It does not have many features. It is riddled with bugs and edge cases that it can’t handle. But that is not important. It works for my problem. If I don’t like something, I can fix it. If bug doesn’t bother me, I’ll let it be. Like all creative endevours, it is important to just start and get it out. You can always improve it later. -I put the source online https://git.sr.ht/~ewintr/shitty-ssg[here]. See https://erikwinter.nl/articles/2021/shitty-ssg-code-walkthrough/[here] for a high level overview. Not for people to blindly copy and run (why would you?), but to give some inspiration for people who are still on the fence. To show them that shitty does not have to be hard and that it can be good enough, as long as it is the right kind of shitty. _Your_ kind of shitty. +I put the source online https://ewintr.nl/shitty-ssg[here]. See https://ewintr.nl/articles/2021/shitty-ssg-code-walkthrough/[here] for a high level overview. Not for people to blindly copy and run (why would you?), but to give some inspiration for people who are still on the fence. To show them that shitty does not have to be hard and that it can be good enough, as long as it is the right kind of shitty. _Your_ kind of shitty. diff --git a/go.mod b/go.mod index 3c7e8fe..1e3e01f 100644 --- a/go.mod +++ b/go.mod @@ -2,7 +2,4 @@ module ewintr.nl/shitty-ssg go 1.16 -require ( - git.sr.ht/~ewintr/erikwinternl/shitty-ssg v0.0.0-20201204092507-5528bf33815d // indirect - git.sr.ht/~ewintr/go-kit v0.0.0-20200704112030-36275689b0ea -) +require ewintr.nl/go-kit v0.0.0-20210919092827-8652e5694945 diff --git a/go.sum b/go.sum index 048b1a9..9627924 100644 --- a/go.sum +++ b/go.sum @@ -1,10 +1,7 @@ cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= -git.sr.ht/~ewintr/erikwinternl v0.0.0-20201204092507-5528bf33815d h1:teNzxpdrJw5sUpB/84ojdjVV2q2+3IVwYjztCze9YmU= -git.sr.ht/~ewintr/erikwinternl/shitty-ssg v0.0.0-20201204092507-5528bf33815d h1:vyJ0Pgdrvqh28jxBCLGCGt/80p86iSQtKJW7rAbYRk8= -git.sr.ht/~ewintr/erikwinternl/shitty-ssg v0.0.0-20201204092507-5528bf33815d/go.mod h1:ka/PzT9A0BNvjcUQpIM0YE1BnOR1/qr6x7XeCUyYDlw= -git.sr.ht/~ewintr/go-kit v0.0.0-20200704112030-36275689b0ea h1:YdHan+/QwjzF05Dlp40BHw5N47nWy2QZCY7aseXf2n0= -git.sr.ht/~ewintr/go-kit v0.0.0-20200704112030-36275689b0ea/go.mod h1:zrpigRr1EHuVGw7GWwvYWwfLgdAwJ110zIRAGtaicvI= +ewintr.nl/go-kit v0.0.0-20210919092827-8652e5694945 h1:8WnxXq3Urg1fkq3nWjCFK18NjpR3mqrRdOfOVNGFi/I= +ewintr.nl/go-kit v0.0.0-20210919092827-8652e5694945/go.mod h1:mIlMyAvKBuuQSQuX5f1+1gYZ02vz6xRFGN9wiO0HfzI= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible/go.mod h1:r7JcOSlj0wfOMncg0iLm8Leh48TZaKVeNIfJntJ2wa0= github.com/Shopify/sarama v1.19.0/go.mod h1:FVkBWblsNy7DGZRfXLU0O9RCGt5g3g3yEuWXgklEdEo= @@ -295,8 +292,9 @@ golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191220142924-d4481acd189f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= +golang.org/x/text v0.3.6 h1:aRYxNxv6iGQlyVaZmk6ZgYEDa+Jg18DxebPSrd6bg1M= +golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= @@ -314,7 +312,6 @@ golang.org/x/tools v0.0.0-20191029190741-b9c20aec41a5/go.mod h1:b+2E5dAYhXwXZwtn golang.org/x/tools v0.0.0-20200103221440-774c71fcf114/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/api v0.3.1/go.mod h1:6wY9I6uQWHQ8EM57III9mq/AjF+i8G65rmVagqKMtkk= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.2.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= diff --git a/pkg/adoc/adoc_test.go b/pkg/adoc/adoc_test.go index de4a260..dc77423 100644 --- a/pkg/adoc/adoc_test.go +++ b/pkg/adoc/adoc_test.go @@ -3,8 +3,8 @@ package adoc_test import ( "testing" - "git.sr.ht/~ewintr/go-kit/test" - "git.sr.ht/~ewintr/shitty-ssg/pkg/adoc" + "ewintr.nl/go-kit/test" + "ewintr.nl/shitty-ssg/pkg/adoc" ) func TestNewKind(t *testing.T) { diff --git a/pkg/adoc/block_test.go b/pkg/adoc/block_test.go index e30169b..2f3b447 100644 --- a/pkg/adoc/block_test.go +++ b/pkg/adoc/block_test.go @@ -3,8 +3,8 @@ package adoc_test import ( "testing" - "git.sr.ht/~ewintr/go-kit/test" - "git.sr.ht/~ewintr/shitty-ssg/pkg/adoc" + "ewintr.nl/go-kit/test" + "ewintr.nl/shitty-ssg/pkg/adoc" ) func TestParagraph(t *testing.T) { diff --git a/pkg/adoc/inline_test.go b/pkg/adoc/inline_test.go index 9800b3e..842343e 100644 --- a/pkg/adoc/inline_test.go +++ b/pkg/adoc/inline_test.go @@ -3,8 +3,8 @@ package adoc_test import ( "testing" - "git.sr.ht/~ewintr/go-kit/test" - "git.sr.ht/~ewintr/shitty-ssg/pkg/adoc" + "ewintr.nl/go-kit/test" + "ewintr.nl/shitty-ssg/pkg/adoc" ) func TestInlineSimple(t *testing.T) { diff --git a/pkg/adoc/parser_test.go b/pkg/adoc/parser_test.go index 72e37cc..b51c3ea 100644 --- a/pkg/adoc/parser_test.go +++ b/pkg/adoc/parser_test.go @@ -5,8 +5,8 @@ import ( "testing" "time" - "git.sr.ht/~ewintr/go-kit/test" - "git.sr.ht/~ewintr/shitty-ssg/pkg/adoc" + "ewintr.nl/go-kit/test" + "ewintr.nl/shitty-ssg/pkg/adoc" ) func TestNew(t *testing.T) {