From fa8004bdbdb235195ceed858a7d1875174e6ae77 Mon Sep 17 00:00:00 2001 From: kt Date: Fri, 24 May 2019 07:59:18 -0700 Subject: [PATCH] moved main to cmd sub directory --- .gitignore | 1 - cmd/{ => tctest/cli}/cmds.go | 2 +- cmd/{ => tctest/cli}/pr.go | 2 +- cmd/{ => tctest/cli}/tc.go | 2 +- main.go => cmd/tctest/tctest.go | 4 ++-- makefile | 6 +++++- 6 files changed, 10 insertions(+), 7 deletions(-) rename cmd/{ => tctest/cli}/cmds.go (99%) rename cmd/{ => tctest/cli}/pr.go (99%) rename cmd/{ => tctest/cli}/tc.go (99%) rename main.go => cmd/tctest/tctest.go (69%) diff --git a/.gitignore b/.gitignore index ecc4c21..00741cb 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,2 @@ -tctest .DS_Store .idea/ \ No newline at end of file diff --git a/cmd/cmds.go b/cmd/tctest/cli/cmds.go similarity index 99% rename from cmd/cmds.go rename to cmd/tctest/cli/cmds.go index a3e59e5..556d2fc 100644 --- a/cmd/cmds.go +++ b/cmd/tctest/cli/cmds.go @@ -1,4 +1,4 @@ -package cmd +package cli import ( "fmt" diff --git a/cmd/pr.go b/cmd/tctest/cli/pr.go similarity index 99% rename from cmd/pr.go rename to cmd/tctest/cli/pr.go index f27707e..b2f800f 100644 --- a/cmd/pr.go +++ b/cmd/tctest/cli/pr.go @@ -1,4 +1,4 @@ -package cmd +package cli import ( "bufio" diff --git a/cmd/tc.go b/cmd/tctest/cli/tc.go similarity index 99% rename from cmd/tc.go rename to cmd/tctest/cli/tc.go index 2fb1dca..0d7934c 100644 --- a/cmd/tc.go +++ b/cmd/tctest/cli/tc.go @@ -1,4 +1,4 @@ -package cmd +package cli import ( "encoding/xml" diff --git a/main.go b/cmd/tctest/tctest.go similarity index 69% rename from main.go rename to cmd/tctest/tctest.go index f279802..c081b3d 100644 --- a/main.go +++ b/cmd/tctest/tctest.go @@ -4,12 +4,12 @@ import ( "os" c "github.com/gookit/color" - "github.com/katbyte/tctest/cmd" + "github.com/katbyte/tctest/cmd/tctest/cli" "github.com/katbyte/tctest/common" ) func main() { - if err := cmd.Make().Execute(); err != nil { + if err := cli.Make().Execute(); err != nil { common.Log.Errorf(c.Sprintf("tctest: %v", err)) os.Exit(1) } diff --git a/makefile b/makefile index 0d4a0a8..e05fc6c 100644 --- a/makefile +++ b/makefile @@ -14,6 +14,10 @@ imports: build: @echo "==> building..." - go build -ldflags "-X github.com/katbyte/tctest/version.GitCommit=${GIT_COMMIT}" . + cd cmd/tctest && go build -ldflags "-X github.com/katbyte/tctest/version.GitCommit=${GIT_COMMIT}" . && mv tctest ../../ + +install: + @echo "==> installing..." + cd cmd/tctest && go install -ldflags "-X github.com/katbyte/tctest/version.GitCommit=${GIT_COMMIT}" . .PHONY: fmt imports build \ No newline at end of file