From 1c4505a2d9d7978ade8878622203e3e522c123ab Mon Sep 17 00:00:00 2001 From: mappu Date: Wed, 12 Jul 2017 18:43:11 +1200 Subject: [PATCH] rename package yatwiki3->yatwiki --- AuthorHash.go | 2 +- DB.go | 2 +- Makefile | 2 +- ServerOptions.go | 2 +- WikiServer.go | 2 +- bbcode.go | 2 +- cmd/yatwiki-server/main.go | 8 ++++---- gzflate.go | 2 +- pageTemplate.go | 2 +- rArchive.go | 2 +- rDiff.go | 4 ++-- rErrors.go | 2 +- rFormatting.go | 2 +- rHistory.go | 2 +- rIndex.go | 2 +- rModify.go | 2 +- rRSS.go | 2 +- rRawView.go | 2 +- rRecentChanges.go | 2 +- rView.go | 2 +- regex.go | 2 +- staticResources.go | 2 +- 22 files changed, 26 insertions(+), 26 deletions(-) diff --git a/AuthorHash.go b/AuthorHash.go index ca06fc3..67cfa04 100644 --- a/AuthorHash.go +++ b/AuthorHash.go @@ -1,4 +1,4 @@ -package yatwiki3 +package yatwiki import ( "crypto/md5" diff --git a/DB.go b/DB.go index c1bb977..1b8ce09 100644 --- a/DB.go +++ b/DB.go @@ -1,4 +1,4 @@ -package yatwiki3 +package yatwiki import ( "database/sql" diff --git a/Makefile b/Makefile index 94d2eb9..d47a59e 100644 --- a/Makefile +++ b/Makefile @@ -34,7 +34,7 @@ clean: # staticResources.go: static/ static/* - go-bindata -o staticResources.go -prefix static -pkg yatwiki3 static + go-bindata -o staticResources.go -prefix static -pkg yatwiki static # diff --git a/ServerOptions.go b/ServerOptions.go index 360e26f..ab0e5fb 100644 --- a/ServerOptions.go +++ b/ServerOptions.go @@ -1,4 +1,4 @@ -package yatwiki3 +package yatwiki import ( "time" diff --git a/WikiServer.go b/WikiServer.go index eb324b4..0452c80 100644 --- a/WikiServer.go +++ b/WikiServer.go @@ -1,4 +1,4 @@ -package yatwiki3 +package yatwiki import ( "database/sql" diff --git a/bbcode.go b/bbcode.go index dad1665..0c6a87e 100644 --- a/bbcode.go +++ b/bbcode.go @@ -1,4 +1,4 @@ -package yatwiki3 +package yatwiki import ( "encoding/json" diff --git a/cmd/yatwiki-server/main.go b/cmd/yatwiki-server/main.go index 577fdc9..a5c3b4d 100644 --- a/cmd/yatwiki-server/main.go +++ b/cmd/yatwiki-server/main.go @@ -8,7 +8,7 @@ import ( "net/http" "os" - "code.ivysaur.me/yatwiki3" + "code.ivysaur.me/yatwiki" ) func main() { @@ -17,13 +17,13 @@ func main() { configPath := flag.String("config", "config.json", "Configuration file") flag.Parse() - opts := yatwiki3.ServerOptions{} + opts := yatwiki.ServerOptions{} cfg, err := ioutil.ReadFile(*configPath) if err != nil { if os.IsNotExist(err) { - opts = *yatwiki3.DefaultOptions() + opts = *yatwiki.DefaultOptions() if cfg, err := json.MarshalIndent(opts, "", "\t"); err == nil { err := ioutil.WriteFile(*configPath, cfg, 0644) if err != nil { @@ -43,7 +43,7 @@ func main() { } } - ws, err := yatwiki3.NewWikiServer(&opts) + ws, err := yatwiki.NewWikiServer(&opts) if err != nil { fmt.Fprintln(os.Stderr, err.Error()) os.Exit(1) diff --git a/gzflate.go b/gzflate.go index decd5c2..d5548e7 100644 --- a/gzflate.go +++ b/gzflate.go @@ -1,4 +1,4 @@ -package yatwiki3 +package yatwiki import ( "bytes" diff --git a/pageTemplate.go b/pageTemplate.go index 5a0baf4..72d46a1 100644 --- a/pageTemplate.go +++ b/pageTemplate.go @@ -1,4 +1,4 @@ -package yatwiki3 +package yatwiki import ( "fmt" diff --git a/rArchive.go b/rArchive.go index 8c3ace1..756e0b1 100644 --- a/rArchive.go +++ b/rArchive.go @@ -1,4 +1,4 @@ -package yatwiki3 +package yatwiki import ( "database/sql" diff --git a/rDiff.go b/rDiff.go index fcd3e6f..37ee819 100644 --- a/rDiff.go +++ b/rDiff.go @@ -1,4 +1,4 @@ -package yatwiki3 +package yatwiki import ( "bytes" @@ -8,7 +8,7 @@ import ( "html/template" "net/http" - "code.ivysaur.me/yatwiki3/diff" + "code.ivysaur.me/yatwiki/diff" ) func (this *WikiServer) routeDiff(w http.ResponseWriter, r *http.Request, oldRev, newRev int) { diff --git a/rErrors.go b/rErrors.go index d547dfd..ce9a259 100644 --- a/rErrors.go +++ b/rErrors.go @@ -1,4 +1,4 @@ -package yatwiki3 +package yatwiki import ( "html/template" diff --git a/rFormatting.go b/rFormatting.go index 1d4f179..ece3da3 100644 --- a/rFormatting.go +++ b/rFormatting.go @@ -1,4 +1,4 @@ -package yatwiki3 +package yatwiki import ( "net/http" diff --git a/rHistory.go b/rHistory.go index b8f4477..fb6fa5e 100644 --- a/rHistory.go +++ b/rHistory.go @@ -1,4 +1,4 @@ -package yatwiki3 +package yatwiki import ( "database/sql" diff --git a/rIndex.go b/rIndex.go index 23082cf..b8a4200 100644 --- a/rIndex.go +++ b/rIndex.go @@ -1,4 +1,4 @@ -package yatwiki3 +package yatwiki import ( "fmt" diff --git a/rModify.go b/rModify.go index f031c45..6c013a0 100644 --- a/rModify.go +++ b/rModify.go @@ -1,4 +1,4 @@ -package yatwiki3 +package yatwiki import ( "database/sql" diff --git a/rRSS.go b/rRSS.go index 52d54cd..6b35141 100644 --- a/rRSS.go +++ b/rRSS.go @@ -1,4 +1,4 @@ -package yatwiki3 +package yatwiki import ( "fmt" diff --git a/rRawView.go b/rRawView.go index bb8ff3a..deee15e 100644 --- a/rRawView.go +++ b/rRawView.go @@ -1,4 +1,4 @@ -package yatwiki3 +package yatwiki import ( "database/sql" diff --git a/rRecentChanges.go b/rRecentChanges.go index fcc24b1..037b556 100644 --- a/rRecentChanges.go +++ b/rRecentChanges.go @@ -1,4 +1,4 @@ -package yatwiki3 +package yatwiki import ( "errors" diff --git a/rView.go b/rView.go index 633340a..4eed7c3 100644 --- a/rView.go +++ b/rView.go @@ -1,4 +1,4 @@ -package yatwiki3 +package yatwiki import ( "database/sql" diff --git a/regex.go b/regex.go index 54aca17..7f344d1 100644 --- a/regex.go +++ b/regex.go @@ -1,4 +1,4 @@ -package yatwiki3 +package yatwiki import ( "regexp" diff --git a/staticResources.go b/staticResources.go index 6c16c59..30652a4 100644 --- a/staticResources.go +++ b/staticResources.go @@ -4,7 +4,7 @@ // static/wiki.css // DO NOT EDIT! -package yatwiki3 +package yatwiki import ( "bytes"