From 03caf453f551a7da3ec41e5a788e070e7c91113f Mon Sep 17 00:00:00 2001 From: gutmet Date: Tue, 18 Jun 2024 22:39:16 +0200 Subject: [PATCH] fix import and module paths --- Readme.md | 6 +++--- cmd/finstr.go | 7 ++++--- crop/crop.go | 3 ++- finstr.go | 9 +++++---- go.mod | 6 +++--- initer/initer.go | 5 +++-- 6 files changed, 20 insertions(+), 16 deletions(-) diff --git a/Readme.md b/Readme.md index 6fe2415..242a6c0 100644 --- a/Readme.md +++ b/Readme.md @@ -6,7 +6,7 @@ finstr is a bullshit-free image gallery generator. It produces pages according t build ======= -If you want to build the executable yourself, you need go1.11+ with module support. Checkout the repository and run 'go build cmd/finstr.go'. +If you want to build the executable yourself, you need go1.14 or higher. Checkout the repository and run 'go build cmd/finstr.go'. quick start ===== @@ -18,7 +18,7 @@ Put the executable somewhere in your path, create a folder for your gallery, the > finstr init ``` -Put some .jpgs inside the img folder. Tag them by creating files with the same name but .tags suffix. Each line is a tag, then +Put some .jpgs inside the img folder. Tag them by creating files with the same name but '.tags' suffix. Each line is a tag, then ``` > finstr gen @@ -26,4 +26,4 @@ Put some .jpgs inside the img folder. Tag them by creating files with the same n > firefox index.html ``` -finstr has also been integrated into the static site generator [wombat](/wombat/about). +finstr has also been integrated into the static site generator [wombat](/aw/wombat). diff --git a/cmd/finstr.go b/cmd/finstr.go index f9037c1..28e89d4 100644 --- a/cmd/finstr.go +++ b/cmd/finstr.go @@ -2,10 +2,11 @@ package main import ( "fmt" - "git.gutmet.org/finstr.git" - "git.gutmet.org/finstr.git/initer" - goutil "git.gutmet.org/goutil.git/misc" "os" + + "git.fireandbrimst.one/aw/finstr" + "git.fireandbrimst.one/aw/finstr/initer" + goutil "git.fireandbrimst.one/aw/goutil/misc" ) func main() { diff --git a/crop/crop.go b/crop/crop.go index 6e95170..8e2611e 100644 --- a/crop/crop.go +++ b/crop/crop.go @@ -2,8 +2,9 @@ package crop import ( "errors" - goutil "git.gutmet.org/goutil.git/misc" "image" + + goutil "git.fireandbrimst.one/aw/goutil/misc" ) func boundInt(i, min, max int) int { diff --git a/finstr.go b/finstr.go index 92c777d..b9e6856 100644 --- a/finstr.go +++ b/finstr.go @@ -5,10 +5,6 @@ import ( "errors" "flag" "fmt" - "git.gutmet.org/finstr.git/crop" - "git.gutmet.org/finstr.git/initer" - "git.gutmet.org/go-resize.git" - goutil "git.gutmet.org/goutil.git/misc" goimg "image" "image/jpeg" "net/url" @@ -20,6 +16,11 @@ import ( "text/template" "time" "unicode" + + "git.fireandbrimst.one/aw/finstr/crop" + "git.fireandbrimst.one/aw/finstr/initer" + "git.fireandbrimst.one/aw/go-resize" + goutil "git.fireandbrimst.one/aw/goutil/misc" ) var dir string diff --git a/go.mod b/go.mod index f8936fa..8db2790 100644 --- a/go.mod +++ b/go.mod @@ -1,8 +1,8 @@ -module git.gutmet.org/finstr.git +module git.fireandbrimst.one/aw/finstr go 1.14 require ( - git.gutmet.org/go-resize.git v0.0.0-20180221191011-83c6a9932646 - git.gutmet.org/goutil.git v0.0.0-20201011110813-b9f7ae29b4e6 + git.fireandbrimst.one/aw/go-resize v0.0.0-20180221191011-83c6a9932646 + git.fireandbrimst.one/aw/goutil v0.0.0-20230304172414-ed46142b443c ) diff --git a/initer/initer.go b/initer/initer.go index 210d61c..7cccdae 100644 --- a/initer/initer.go +++ b/initer/initer.go @@ -2,9 +2,10 @@ package initer import ( "flag" - goutil "git.gutmet.org/goutil.git/misc" "os" "path/filepath" + + goutil "git.fireandbrimst.one/aw/goutil/misc" ) const htmlTemplate = ` @@ -117,7 +118,7 @@ func Init(fl IniterFlags) error { template = htmlTemplate } err = goutil.OptDo(err, func() error { return goutil.WriteFile(InitFlag(dir), style) }) - err = goutil.OptDo(err, func() error { return goutil.WriteFile(readme(dir), "Put your .jpgs and .tags here") }) + err = goutil.OptDo(err, func() error { return goutil.WriteFile(readme(dir), "Put your .jpgs and .tags here\n") }) err = goutil.OptDo(err, func() error { return goutil.WriteFile(TemplateFile(dir), template) }) return err }