diff --git a/protoc.go b/protoc.go index f3b545d..b67effa 100644 --- a/protoc.go +++ b/protoc.go @@ -5,6 +5,7 @@ package main import ( "errors" "os" + "strings" "go.wit.com/lib/gui/shell" "go.wit.com/lib/protobuf/forgepb" @@ -34,35 +35,43 @@ func protocBuild(names map[string]string) error { } log.Info("make protoc file:", names["protoc"]) log.Info("go src", forge.GetGoSrc()) + pwd, _ := os.Getwd() + log.Info("go.Getwd()", pwd) + if ! strings.HasPrefix(pwd, forge.GetGoSrc()) { + return errors.New("paths don't match") + } + gopath := strings.TrimPrefix(pwd, forge.GetGoSrc()) + log.Info("gopath", gopath) return errors.New("make protoc here") } - /* - data, err := os.ReadFile(fullname) - if err != nil { - // log.Info("open config file :", err) - return err - } - w, _ := os.OpenFile(names["protobase"]+".pb.go", os.O_WRONLY|os.O_CREATE, 0600) +/* + data, err := os.ReadFile(fullname) + if err != nil { + // log.Info("open config file :", err) + return err + } - var found bool + w, _ := os.OpenFile(names["protobase"]+".pb.go", os.O_WRONLY|os.O_CREATE, 0600) - lines := strings.Split(string(data), "\n") - for _, line := range lines { - // log.Info("line:", line) - start := "type " + names["Bases"] + " struct {" - if strings.HasSuffix(line, start) { - found = true - log.Info("FOUND line:", line) - fmt.Fprintln(w, line) - fmt.Fprintln(w, "\tsync.RWMutex // auto-added by go.wit.com/apps/autogenpb") - fmt.Fprintln(w, "") - } else { - fmt.Fprintln(w, line) - } + var found bool + + lines := strings.Split(string(data), "\n") + for _, line := range lines { + // log.Info("line:", line) + start := "type " + names["Bases"] + " struct {" + if strings.HasSuffix(line, start) { + found = true + log.Info("FOUND line:", line) + fmt.Fprintln(w, line) + fmt.Fprintln(w, "\tsync.RWMutex // auto-added by go.wit.com/apps/autogenpb") + fmt.Fprintln(w, "") + } else { + fmt.Fprintln(w, line) } - // os.Exit(-1) - if found { - return nil - } - */ + } + // os.Exit(-1) + if found { + return nil + } +*/