From 3520a0b450e8586d1cb046c0c29c5379520038d9 Mon Sep 17 00:00:00 2001 From: gutmet Date: Tue, 18 Jun 2024 23:01:52 +0200 Subject: [PATCH] fix import and module paths --- blog/blog.go | 4 ++-- converter/converter.go | 5 +++-- gallery/gallery.go | 5 +++-- gallery/new.go | 5 +++-- generate/generate.go | 17 +++++++++-------- go.mod | 8 ++++---- initer/initer.go | 6 +++--- page/page.go | 5 +++-- post/post.go | 6 +++--- site/site.go | 4 ++-- splitter/splitter.go | 3 ++- wombat.go | 15 ++++++++------- 12 files changed, 45 insertions(+), 38 deletions(-) diff --git a/blog/blog.go b/blog/blog.go index b669e7a..588991c 100644 --- a/blog/blog.go +++ b/blog/blog.go @@ -13,8 +13,8 @@ import ( "text/template" "time" - goutil "git.gutmet.org/goutil.git/misc" - . "git.gutmet.org/wombat.git/templatestructures" + goutil "git.fireandbrimst.one/aw/goutil/misc" + . "git.fireandbrimst.one/aw/wombat/templatestructures" ) const postsPerPage int = 5 diff --git a/converter/converter.go b/converter/converter.go index 16131e8..a556847 100644 --- a/converter/converter.go +++ b/converter/converter.go @@ -2,10 +2,11 @@ package converter import ( "fmt" - goutil "git.gutmet.org/goutil.git/misc" - "github.com/russross/blackfriday/v2" "os" "sync" + + goutil "git.fireandbrimst.one/aw/goutil/misc" + "github.com/russross/blackfriday/v2" ) func convert(f string) { diff --git a/gallery/gallery.go b/gallery/gallery.go index d1bc509..b2614cf 100644 --- a/gallery/gallery.go +++ b/gallery/gallery.go @@ -3,9 +3,10 @@ package gallery import ( "flag" "fmt" - "git.gutmet.org/finstr.git" - goutil "git.gutmet.org/goutil.git/misc" "path/filepath" + + "git.fireandbrimst.one/aw/finstr" + goutil "git.fireandbrimst.one/aw/goutil/misc" ) const Prefix string = "photos" diff --git a/gallery/new.go b/gallery/new.go index 37968f3..d6b7797 100644 --- a/gallery/new.go +++ b/gallery/new.go @@ -3,8 +3,9 @@ package gallery import ( "errors" "flag" - finstr "git.gutmet.org/finstr.git/initer" - goutil "git.gutmet.org/goutil.git/misc" + + finstr "git.fireandbrimst.one/aw/finstr/initer" + goutil "git.fireandbrimst.one/aw/goutil/misc" ) func New(fl finstr.IniterFlags) error { diff --git a/generate/generate.go b/generate/generate.go index 6d1d366..54c7b38 100644 --- a/generate/generate.go +++ b/generate/generate.go @@ -3,15 +3,16 @@ package generate import ( "flag" "fmt" - "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" - "git.gutmet.org/wombat.git/gallery" - "git.gutmet.org/wombat.git/site" - "git.gutmet.org/wombat.git/splitter" "os" + + "git.fireandbrimst.one/aw/goutil/copy" + goutil "git.fireandbrimst.one/aw/goutil/misc" + "git.fireandbrimst.one/aw/simpleserver" + "git.fireandbrimst.one/aw/wombat/blog" + "git.fireandbrimst.one/aw/wombat/converter" + "git.fireandbrimst.one/aw/wombat/gallery" + "git.fireandbrimst.one/aw/wombat/site" + "git.fireandbrimst.one/aw/wombat/splitter" ) func removeAll(path string) { diff --git a/go.mod b/go.mod index ff9d5da..125b44d 100644 --- a/go.mod +++ b/go.mod @@ -1,11 +1,11 @@ -module git.gutmet.org/wombat.git +module git.fireandbrimst.one/aw/wombat go 1.14 require ( - git.gutmet.org/finstr.git v0.0.0-20210628072143-8f552a2440f5 - git.gutmet.org/goutil.git v0.0.0-20201108182825-c19893df11f9 - git.gutmet.org/simpleserver.git v0.0.0-20201011112611-555b83d5de53 + git.fireandbrimst.one/aw/finstr v0.0.0-20240618203916-03caf453f551 + git.fireandbrimst.one/aw/goutil v0.0.0-20230304172414-ed46142b443c + git.fireandbrimst.one/aw/simpleserver v0.0.0-20240618204754-ba16ff26e972 github.com/pmezard/go-difflib v1.0.0 // indirect github.com/russross/blackfriday/v2 v2.0.1 github.com/shurcooL/sanitized_anchor_name v1.0.0 // indirect diff --git a/initer/initer.go b/initer/initer.go index 459158a..a52c21c 100644 --- a/initer/initer.go +++ b/initer/initer.go @@ -7,9 +7,9 @@ import ( "os" "path/filepath" - finstr "git.gutmet.org/finstr.git/initer" - goutil "git.gutmet.org/goutil.git/misc" - "git.gutmet.org/wombat.git/gallery" + finstr "git.fireandbrimst.one/aw/finstr/initer" + goutil "git.fireandbrimst.one/aw/goutil/misc" + "git.fireandbrimst.one/aw/wombat/gallery" ) const ( diff --git a/page/page.go b/page/page.go index 865132d..b4cc047 100644 --- a/page/page.go +++ b/page/page.go @@ -5,12 +5,13 @@ import ( "errors" "flag" "fmt" - goutil "git.gutmet.org/goutil.git/misc" - gen "git.gutmet.org/wombat.git/generate" "io/ioutil" "os" "path/filepath" "text/template" + + goutil "git.fireandbrimst.one/aw/goutil/misc" + gen "git.fireandbrimst.one/aw/wombat/generate" ) var pageStub string = `--- diff --git a/post/post.go b/post/post.go index b65390b..d9bf64d 100644 --- a/post/post.go +++ b/post/post.go @@ -11,9 +11,9 @@ import ( "text/template" "time" - goutil "git.gutmet.org/goutil.git/misc" - "git.gutmet.org/wombat.git/blog" - gen "git.gutmet.org/wombat.git/generate" + goutil "git.fireandbrimst.one/aw/goutil/misc" + "git.fireandbrimst.one/aw/wombat/blog" + gen "git.fireandbrimst.one/aw/wombat/generate" ) const dateformat string = "2006-01-02" diff --git a/site/site.go b/site/site.go index fc3e323..697f6a0 100644 --- a/site/site.go +++ b/site/site.go @@ -11,8 +11,8 @@ import ( "strings" "text/template" - goutil "git.gutmet.org/goutil.git/misc" - . "git.gutmet.org/wombat.git/templatestructures" + goutil "git.fireandbrimst.one/aw/goutil/misc" + . "git.fireandbrimst.one/aw/wombat/templatestructures" ) type metadata struct { diff --git a/splitter/splitter.go b/splitter/splitter.go index d88e845..d52d233 100644 --- a/splitter/splitter.go +++ b/splitter/splitter.go @@ -4,10 +4,11 @@ import ( "bufio" "bytes" "fmt" - goutil "git.gutmet.org/goutil.git/misc" "os" "strings" "sync" + + goutil "git.fireandbrimst.one/aw/goutil/misc" ) func writeMetadata(filename string, metadata string) { diff --git a/wombat.go b/wombat.go index 8d15f3d..7fd72a4 100644 --- a/wombat.go +++ b/wombat.go @@ -2,14 +2,15 @@ package main import ( "fmt" - goutil "git.gutmet.org/goutil.git/misc" - "git.gutmet.org/simpleserver.git" - "git.gutmet.org/wombat.git/gallery" - "git.gutmet.org/wombat.git/generate" - "git.gutmet.org/wombat.git/initer" - "git.gutmet.org/wombat.git/page" - "git.gutmet.org/wombat.git/post" "os" + + goutil "git.fireandbrimst.one/aw/goutil/misc" + "git.fireandbrimst.one/aw/simpleserver" + "git.fireandbrimst.one/aw/wombat/gallery" + "git.fireandbrimst.one/aw/wombat/generate" + "git.fireandbrimst.one/aw/wombat/initer" + "git.fireandbrimst.one/aw/wombat/page" + "git.fireandbrimst.one/aw/wombat/post" ) func serve(args []string) error {