diff --git a/blog/blog.go b/blog/blog.go index 09d17a4..817e97a 100644 --- a/blog/blog.go +++ b/blog/blog.go @@ -3,7 +3,7 @@ package blog import ( "bytes" "fmt" - "git.gutmet.org/goutil.git" + goutil "git.gutmet.org/goutil.git/misc" . "git.gutmet.org/wombat.git/templatestructures" "math" "os" diff --git a/converter/converter.go b/converter/converter.go index dfa179e..16131e8 100644 --- a/converter/converter.go +++ b/converter/converter.go @@ -2,7 +2,7 @@ package converter import ( "fmt" - "git.gutmet.org/goutil.git" + goutil "git.gutmet.org/goutil.git/misc" "github.com/russross/blackfriday/v2" "os" "sync" diff --git a/gallery/gallery.go b/gallery/gallery.go index 7110d22..d1bc509 100644 --- a/gallery/gallery.go +++ b/gallery/gallery.go @@ -4,7 +4,7 @@ import ( "flag" "fmt" "git.gutmet.org/finstr.git" - "git.gutmet.org/goutil.git" + goutil "git.gutmet.org/goutil.git/misc" "path/filepath" ) diff --git a/gallery/new.go b/gallery/new.go index a5328e1..37968f3 100644 --- a/gallery/new.go +++ b/gallery/new.go @@ -4,7 +4,7 @@ import ( "errors" "flag" finstr "git.gutmet.org/finstr.git/initer" - "git.gutmet.org/goutil.git" + goutil "git.gutmet.org/goutil.git/misc" ) func New(fl finstr.IniterFlags) error { diff --git a/generate/generate.go b/generate/generate.go index 05a13d3..e96d157 100644 --- a/generate/generate.go +++ b/generate/generate.go @@ -3,7 +3,8 @@ package generate import ( "flag" "fmt" - "git.gutmet.org/goutil.git" + "git.gutmet.org/goutil.git/copy" + goutil "git.gutmet.org/goutil.git/misc" "git.gutmet.org/simpleserver.git" "git.gutmet.org/wombat.git/blog" "git.gutmet.org/wombat.git/converter" @@ -27,7 +28,7 @@ func clean() { } func stage1() { - goutil.CopyDirsLinkFiles("stage0", "stage1") + copy.CopyDirsLinkFiles("stage0", "stage1") mdfiles := goutil.RecListFilesExt("stage1", ".md") htmlfrags := goutil.RecListFilesExt("stage1", ".html") splitter.SplitAll(append(mdfiles, htmlfrags...)) @@ -43,7 +44,7 @@ func blogs() []string { } func stage2() { - goutil.CopyDirsLinkFiles("stage1", "stage2") + copy.CopyDirsLinkFiles("stage1", "stage2") site.Generate() for _, blogdir := range blogs() { blog.Generate(blogdir) diff --git a/go.mod b/go.mod index 64e48f9..34eb14a 100644 --- a/go.mod +++ b/go.mod @@ -1,10 +1,12 @@ module git.gutmet.org/wombat.git +go 1.14 + require ( - git.gutmet.org/finstr.git v0.0.0-20190103161247-f1cd2d363522 - git.gutmet.org/goutil.git v0.0.0-20190727202444-1a369915ff2f - git.gutmet.org/simpleserver.git v0.0.0-20181209151100-b298451c1f40 + git.gutmet.org/finstr.git v0.0.0-20201011113018-f6da72ffcf26 + git.gutmet.org/goutil.git v0.0.0-20201011110813-b9f7ae29b4e6 + git.gutmet.org/simpleserver.git v0.0.0-20201011112611-555b83d5de53 + github.com/pmezard/go-difflib v1.0.0 // indirect github.com/russross/blackfriday/v2 v2.0.1 github.com/shurcooL/sanitized_anchor_name v0.0.0-20170918181015-86672fcb3f95 // indirect - golang.org/x/net v0.0.0-20190213061140-3a22650c66bd // indirect ) diff --git a/initer/initer.go b/initer/initer.go index 3b64d1e..7bf642d 100644 --- a/initer/initer.go +++ b/initer/initer.go @@ -5,7 +5,7 @@ import ( "flag" "fmt" finstr "git.gutmet.org/finstr.git/initer" - "git.gutmet.org/goutil.git" + goutil "git.gutmet.org/goutil.git/misc" "git.gutmet.org/wombat.git/gallery" "os" "path/filepath" diff --git a/post/post.go b/post/post.go index 0c7797f..e80b6d0 100644 --- a/post/post.go +++ b/post/post.go @@ -4,7 +4,7 @@ import ( "bytes" "flag" "fmt" - "git.gutmet.org/goutil.git" + goutil "git.gutmet.org/goutil.git/misc" "git.gutmet.org/wombat.git/blog" gen "git.gutmet.org/wombat.git/generate" "git.gutmet.org/wombat.git/initer" diff --git a/site/site.go b/site/site.go index 2d895b9..3c90a25 100644 --- a/site/site.go +++ b/site/site.go @@ -4,7 +4,7 @@ import ( "bufio" "bytes" "fmt" - "git.gutmet.org/goutil.git" + goutil "git.gutmet.org/goutil.git/misc" . "git.gutmet.org/wombat.git/templatestructures" "io/ioutil" "os" diff --git a/splitter/splitter.go b/splitter/splitter.go index f9eeddc..d88e845 100644 --- a/splitter/splitter.go +++ b/splitter/splitter.go @@ -4,7 +4,7 @@ import ( "bufio" "bytes" "fmt" - "git.gutmet.org/goutil.git" + goutil "git.gutmet.org/goutil.git/misc" "os" "strings" "sync" diff --git a/wombat.go b/wombat.go index 11d0f8c..a5364ed 100644 --- a/wombat.go +++ b/wombat.go @@ -2,7 +2,7 @@ package main import ( "fmt" - "git.gutmet.org/goutil.git" + goutil "git.gutmet.org/goutil.git/misc" "git.gutmet.org/simpleserver.git" "git.gutmet.org/wombat.git/gallery" "git.gutmet.org/wombat.git/generate"