From 9a3512c21871a87e650d129f3eb394d8ff123de3 Mon Sep 17 00:00:00 2001 From: k1574 Date: Sat, 6 Aug 2022 07:45:08 +0500 Subject: [PATCH] Fit new username and build system. --- go.mod | 4 +-- go.sum | 2 ++ m/cmd/goblin/main.go | 54 -------------------------------- src/cmd/goblin/main.go | 54 ++++++++++++++++++++++++++++++++ {m => src}/input/read.go | 0 {m => src}/tool/basename/run.go | 0 {m => src}/tool/cat/cat.go | 0 {m => src}/tool/date/date.go | 0 {m => src}/tool/ec/run.go | 0 {m => src}/tool/echo/echo.go | 0 {m => src}/tool/ftest/main.go | 0 {m => src}/tool/gfalse/false.go | 0 {m => src}/tool/grange/main.go | 0 {m => src}/tool/gtrue/true.go | 0 {m => src}/tool/ls/ls.go | 0 {m => src}/tool/mergelbl/main.go | 0 {m => src}/tool/mkdir/mkdir.go | 0 {m => src}/tool/noext/noext.go | 0 {m => src}/tool/quote/quote.go | 0 {m => src}/tool/read/main.go | 0 {m => src}/tool/sort/sort.go | 2 +- {m => src}/tool/tac/tac.go | 0 {m => src}/tool/uniq/uniq.go | 0 {m => src}/tool/urlprs/urlprs.go | 0 {m => src}/tool/wc/main.go | 0 {m => src}/tool/yes/yes.go | 2 +- 26 files changed, 60 insertions(+), 58 deletions(-) delete mode 100644 m/cmd/goblin/main.go create mode 100644 src/cmd/goblin/main.go rename {m => src}/input/read.go (100%) rename {m => src}/tool/basename/run.go (100%) rename {m => src}/tool/cat/cat.go (100%) rename {m => src}/tool/date/date.go (100%) rename {m => src}/tool/ec/run.go (100%) rename {m => src}/tool/echo/echo.go (100%) rename {m => src}/tool/ftest/main.go (100%) rename {m => src}/tool/gfalse/false.go (100%) rename {m => src}/tool/grange/main.go (100%) rename {m => src}/tool/gtrue/true.go (100%) rename {m => src}/tool/ls/ls.go (100%) rename {m => src}/tool/mergelbl/main.go (100%) rename {m => src}/tool/mkdir/mkdir.go (100%) rename {m => src}/tool/noext/noext.go (100%) rename {m => src}/tool/quote/quote.go (100%) rename {m => src}/tool/read/main.go (100%) rename {m => src}/tool/sort/sort.go (87%) rename {m => src}/tool/tac/tac.go (100%) rename {m => src}/tool/uniq/uniq.go (100%) rename {m => src}/tool/urlprs/urlprs.go (100%) rename {m => src}/tool/wc/main.go (100%) rename {m => src}/tool/yes/yes.go (96%) diff --git a/go.mod b/go.mod index 8534260..37b409d 100644 --- a/go.mod +++ b/go.mod @@ -1,5 +1,5 @@ -module github.com/k1574/goblin +module github.com/surdeus/goblin go 1.18 -require github.com/k1574/gomtool v0.0.0-20220616060224-023d1559d777 // indirect +require github.com/surdeus/gomtool v0.0.0-20220806023210-bb1d6be89aa1 // indirect diff --git a/go.sum b/go.sum index 47d9856..acee12a 100644 --- a/go.sum +++ b/go.sum @@ -1,2 +1,4 @@ github.com/k1574/gomtool v0.0.0-20220616060224-023d1559d777 h1:r4Wm40GwE7GNC3VbIwVGtD8dPDw5NDsI5xlpcYF5Nv4= github.com/k1574/gomtool v0.0.0-20220616060224-023d1559d777/go.mod h1:XT2+xWYiSEE6eX/nBgE6UnfIrBfijwPfv4fNJSVD+SA= +github.com/surdeus/gomtool v0.0.0-20220806023210-bb1d6be89aa1 h1:eTeqQV207H2ho0QFMxgxI75oT8E69aExmX6f6oltl9Y= +github.com/surdeus/gomtool v0.0.0-20220806023210-bb1d6be89aa1/go.mod h1:48d4QXOu0MwH0fbqseBInNdS6WiJ0+EzZU9K5sGu4uo= diff --git a/m/cmd/goblin/main.go b/m/cmd/goblin/main.go deleted file mode 100644 index d165d5e..0000000 --- a/m/cmd/goblin/main.go +++ /dev/null @@ -1,54 +0,0 @@ -package main - -import( - "github.com/k1574/gomtool/m/multitool" - "github.com/k1574/goblin/m/tool/cat" - "github.com/k1574/goblin/m/tool/echo" - "github.com/k1574/goblin/m/tool/mkdir" - "github.com/k1574/goblin/m/tool/gtrue" - "github.com/k1574/goblin/m/tool/gfalse" - "github.com/k1574/goblin/m/tool/sort" - "github.com/k1574/goblin/m/tool/tac" - "github.com/k1574/goblin/m/tool/ls" - "github.com/k1574/goblin/m/tool/yes" - "github.com/k1574/goblin/m/tool/date" - "github.com/k1574/goblin/m/tool/uniq" - "github.com/k1574/goblin/m/tool/quote" - "github.com/k1574/goblin/m/tool/urlprs" - "github.com/k1574/goblin/m/tool/noext" - "github.com/k1574/goblin/m/tool/mergelbl" - "github.com/k1574/goblin/m/tool/basename" - "github.com/k1574/goblin/m/tool/ec" - "github.com/k1574/goblin/m/tool/read" - "github.com/k1574/goblin/m/tool/wc" - "github.com/k1574/goblin/m/tool/ftest" - "github.com/k1574/goblin/m/tool/grange" -) - -func main() { - tools := multitool.Tools { - "basename" : basename.Run, - "cat": cat.Run, - "mkdir" : mkdir.Run, - "echo" : echo.Run, - "true" : gtrue.Run, - "false" : gfalse.Run, - "sort" : sort.Run, - "tac" : tac.Run, - "ls" : ls.Run, - "yes" : yes.Run, - "date" : date.Run, - "uniq" : uniq.Run, - "quote" : quote.Run, - "urlprs" : urlprs.Run, - "noext" : noext.Run, - "mergelbl" : mergelbl.Run, - "ec" : ec.Run, - "read" : read.Run, - "wc" : wc.Run, - "ftest" : ftest.Run, - "range" : grange.Run, - } - - multitool.Main("goblin", tools) -} diff --git a/src/cmd/goblin/main.go b/src/cmd/goblin/main.go new file mode 100644 index 0000000..4a7f1f1 --- /dev/null +++ b/src/cmd/goblin/main.go @@ -0,0 +1,54 @@ +package main + +import( + "github.com/surdeus/gomtool/src/multitool" + "github.com/surdeus/goblin/src/tool/cat" + "github.com/surdeus/goblin/src/tool/echo" + "github.com/surdeus/goblin/src/tool/mkdir" + "github.com/surdeus/goblin/src/tool/gtrue" + "github.com/surdeus/goblin/src/tool/gfalse" + "github.com/surdeus/goblin/src/tool/sort" + "github.com/surdeus/goblin/src/tool/tac" + "github.com/surdeus/goblin/src/tool/ls" + "github.com/surdeus/goblin/src/tool/yes" + "github.com/surdeus/goblin/src/tool/date" + "github.com/surdeus/goblin/src/tool/uniq" + "github.com/surdeus/goblin/src/tool/quote" + "github.com/surdeus/goblin/src/tool/urlprs" + "github.com/surdeus/goblin/src/tool/noext" + "github.com/surdeus/goblin/src/tool/mergelbl" + "github.com/surdeus/goblin/src/tool/basename" + "github.com/surdeus/goblin/src/tool/ec" + "github.com/surdeus/goblin/src/tool/read" + "github.com/surdeus/goblin/src/tool/wc" + "github.com/surdeus/goblin/src/tool/ftest" + "github.com/surdeus/goblin/src/tool/grange" +) + +func main() { + tools := multitool.Tools { + "basename" : basename.Run, + "cat": cat.Run, + "mkdir" : mkdir.Run, + "echo" : echo.Run, + "true" : gtrue.Run, + "false" : gfalse.Run, + "sort" : sort.Run, + "tac" : tac.Run, + "ls" : ls.Run, + "yes" : yes.Run, + "date" : date.Run, + "uniq" : uniq.Run, + "quote" : quote.Run, + "urlprs" : urlprs.Run, + "noext" : noext.Run, + "mergelbl" : mergelbl.Run, + "ec" : ec.Run, + "read" : read.Run, + "wc" : wc.Run, + "ftest" : ftest.Run, + "range" : grange.Run, + } + + multitool.Main("goblin", tools) +} diff --git a/m/input/read.go b/src/input/read.go similarity index 100% rename from m/input/read.go rename to src/input/read.go diff --git a/m/tool/basename/run.go b/src/tool/basename/run.go similarity index 100% rename from m/tool/basename/run.go rename to src/tool/basename/run.go diff --git a/m/tool/cat/cat.go b/src/tool/cat/cat.go similarity index 100% rename from m/tool/cat/cat.go rename to src/tool/cat/cat.go diff --git a/m/tool/date/date.go b/src/tool/date/date.go similarity index 100% rename from m/tool/date/date.go rename to src/tool/date/date.go diff --git a/m/tool/ec/run.go b/src/tool/ec/run.go similarity index 100% rename from m/tool/ec/run.go rename to src/tool/ec/run.go diff --git a/m/tool/echo/echo.go b/src/tool/echo/echo.go similarity index 100% rename from m/tool/echo/echo.go rename to src/tool/echo/echo.go diff --git a/m/tool/ftest/main.go b/src/tool/ftest/main.go similarity index 100% rename from m/tool/ftest/main.go rename to src/tool/ftest/main.go diff --git a/m/tool/gfalse/false.go b/src/tool/gfalse/false.go similarity index 100% rename from m/tool/gfalse/false.go rename to src/tool/gfalse/false.go diff --git a/m/tool/grange/main.go b/src/tool/grange/main.go similarity index 100% rename from m/tool/grange/main.go rename to src/tool/grange/main.go diff --git a/m/tool/gtrue/true.go b/src/tool/gtrue/true.go similarity index 100% rename from m/tool/gtrue/true.go rename to src/tool/gtrue/true.go diff --git a/m/tool/ls/ls.go b/src/tool/ls/ls.go similarity index 100% rename from m/tool/ls/ls.go rename to src/tool/ls/ls.go diff --git a/m/tool/mergelbl/main.go b/src/tool/mergelbl/main.go similarity index 100% rename from m/tool/mergelbl/main.go rename to src/tool/mergelbl/main.go diff --git a/m/tool/mkdir/mkdir.go b/src/tool/mkdir/mkdir.go similarity index 100% rename from m/tool/mkdir/mkdir.go rename to src/tool/mkdir/mkdir.go diff --git a/m/tool/noext/noext.go b/src/tool/noext/noext.go similarity index 100% rename from m/tool/noext/noext.go rename to src/tool/noext/noext.go diff --git a/m/tool/quote/quote.go b/src/tool/quote/quote.go similarity index 100% rename from m/tool/quote/quote.go rename to src/tool/quote/quote.go diff --git a/m/tool/read/main.go b/src/tool/read/main.go similarity index 100% rename from m/tool/read/main.go rename to src/tool/read/main.go diff --git a/m/tool/sort/sort.go b/src/tool/sort/sort.go similarity index 87% rename from m/tool/sort/sort.go rename to src/tool/sort/sort.go index bc117a6..dc92c4c 100644 --- a/m/tool/sort/sort.go +++ b/src/tool/sort/sort.go @@ -5,7 +5,7 @@ import ( "os" "sort" "flag" - "github.com/k1574/goblin/m/input" + "github.com/surdeus/goblin/src/input" ) func Run(args []string) { diff --git a/m/tool/tac/tac.go b/src/tool/tac/tac.go similarity index 100% rename from m/tool/tac/tac.go rename to src/tool/tac/tac.go diff --git a/m/tool/uniq/uniq.go b/src/tool/uniq/uniq.go similarity index 100% rename from m/tool/uniq/uniq.go rename to src/tool/uniq/uniq.go diff --git a/m/tool/urlprs/urlprs.go b/src/tool/urlprs/urlprs.go similarity index 100% rename from m/tool/urlprs/urlprs.go rename to src/tool/urlprs/urlprs.go diff --git a/m/tool/wc/main.go b/src/tool/wc/main.go similarity index 100% rename from m/tool/wc/main.go rename to src/tool/wc/main.go diff --git a/m/tool/yes/yes.go b/src/tool/yes/yes.go similarity index 96% rename from m/tool/yes/yes.go rename to src/tool/yes/yes.go index 4acb2f6..9573cac 100644 --- a/m/tool/yes/yes.go +++ b/src/tool/yes/yes.go @@ -6,7 +6,7 @@ import( "fmt" "flag" "strings" - "github.com/k1574/goblin/m/input" + "github.com/surdeus/goblin/src/input" ) var( nArg int