From 5846d5e4affbb2c2a220453a3de3c335b43cd2d6 Mon Sep 17 00:00:00 2001 From: Jeff Carr Date: Wed, 4 Dec 2024 15:35:27 -0600 Subject: [PATCH] minor mv code --- Makefile | 2 +- main.go | 12 ++++++++++++ protoc.go | 6 ------ 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index 9465d14..2bb0261 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ VERSION = $(shell git describe --tags) BUILDTIME = $(shell date +%Y.%m.%d) -run: vet build +run: goimports vet install vet: @GO111MODULE=off go vet diff --git a/main.go b/main.go index 705b46e..52e2d31 100644 --- a/main.go +++ b/main.go @@ -52,6 +52,18 @@ func main() { os.Exit(-1) } + // have to figure out how to run protoc so initialize forge + forge = forgepb.Init() + + gosrc := forge.GetGoSrc() + pwd, _ := os.Getwd() + + if strings.HasPrefix(pwd, gosrc) { + log.Info("does match", pwd, "vs", gosrc) + } else { + log.Info("does not match. should exit(-1) here", pwd, "vs", gosrc) + } + if !shell.Exists("go.sum") { shell.RunQuiet([]string{"go", "mod", "init"}) shell.RunQuiet([]string{"go", "mod", "tidy"}) diff --git a/protoc.go b/protoc.go index acd6ad7..af7e0d1 100644 --- a/protoc.go +++ b/protoc.go @@ -9,7 +9,6 @@ import ( "strings" "go.wit.com/lib/gui/shell" - "go.wit.com/lib/protobuf/forgepb" "go.wit.com/log" ) @@ -31,11 +30,6 @@ func protocBuild(names map[string]string) error { return err } - // have to figure out how to run protoc so initialize forge - forge = forgepb.Init() - // forge.ConfigPrintTable() - os.Setenv("REPO_WORK_PATH", forge.GetGoSrc()) - log.Info("") if shell.Exists(names["protoc"]) { log.Info("protoc file already created", names["protoc"])