lots of fixes in gitpbv0.0.31

1 files changed, 10 insertions, 12 deletions

diff --git a/main.go b/main.go
index 9fa2c01..064953a 100644
--- a/main.go
+++ b/main.go
@@ -11,7 +11,6 @@ import (
 	"github.com/alexflint/go-arg"
 	"github.com/go-cmd/cmd"
 	"go.wit.com/lib/gui/shell"
-	"go.wit.com/lib/protobuf/forgepb"
 	"go.wit.com/log"
 	"golang.org/x/text/cases"
 	"golang.org/x/text/language"
@@ -22,7 +21,6 @@ var VERSION string
 var BUILDTIME string
 
 var sortmap map[string]string
-var forge *forgepb.Forge // forgepb figures out how to run protoc correctly if it's needed
 var marshalKeys []string
 var uniqueKeys []string
 
@@ -53,17 +51,16 @@ 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 argv.GoSrc == "" {
+		argv.GoSrc = "/home/jcarr/go/src"
+	}
 
-	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 argv.GoPath == "" {
+		pwd, _ := os.Getwd()
+		argv.GoPath = strings.TrimPrefix(pwd, argv.GoSrc)
+		argv.GoPath = strings.Trim(argv.GoPath, "/")
 	}
+	log.Info(argv.GoSrc, argv.GoPath)
 
 	if !shell.Exists("go.sum") {
 		shell.RunQuiet([]string{"go", "mod", "init"})
@@ -73,7 +70,8 @@ func main() {
 
 	var result cmd.Status
 	var cmd []string
-	if forge.IsGoWork() {
+	// if forge.IsGoWork() {
+	if false {
 		cmd = []string{"go", "work", "use"}
 		result = shell.Run(cmd)
 		log.Info(strings.Join(result.Stdout, "\n"))