fixes. needs a refactorv0.22.128

6 files changed, 52 insertions, 34 deletions

diff --git a/Makefile b/Makefile
index 33ab2cd..177854c 100644
--- a/Makefile
+++ b/Makefile
@@ -4,9 +4,9 @@ VERSION = $(shell git describe --tags)
 DATE = $(shell date +%Y.%m.%d)
 
 run: clean goimports vet install
-	go-deb --release --auto --forge go.wit.com/apps/autogenpb --dir /tmp/
-	go-deb --release --auto --forge go.wit.com/apps/go-mod-clean --dir /tmp/
-	@#go-deb --forge go.wit.com/apps/autotypist --auto
+	go-deb --release --forge go.wit.com/apps/autogenpb --dir /tmp/
+	go-deb --release --forge go.wit.com/apps/go-mod-clean --dir /tmp/
+	@#go-deb --forge go.wit.com/apps/autotypist
 	ls -lth /tmp/*deb
 
 vet:
@@ -14,7 +14,7 @@ vet:
 	@echo this go library package builds okay
 
 auto-build: build
-	./go-deb --auto --repo go.wit.com/apps/autotypist
+	./go-deb --repo go.wit.com/apps/autotypist
 
 build: goimports vet
 	-rm resources/*.so
@@ -53,16 +53,16 @@ clean:
 	touch resources/blank.so
 
 build-go-gui-toolkits: build
-	./go-deb --release --auto --repo go.wit.com/apps/go-gui-toolkits
+	./go-deb --release --repo go.wit.com/apps/go-gui-toolkits
 
 build-test-failure: build
-	./go-deb --release --auto --repo go.wit.com/apps/junk
+	./go-deb --release --repo go.wit.com/apps/junk
 
 build-test-keep-files: build
-	./go-deb --auto --keep-files --repo go.wit.com/apps/go-deb
+	./go-deb --keep-files --repo go.wit.com/apps/go-deb
 
 build-release:
-	go-deb --release --auto --repo go.wit.com/apps/go-deb
+	go-deb --release --repo go.wit.com/apps/go-deb
 
 debian: build
-	./go-deb --auto --keep-files --repo go.wit.com/apps/go-deb
+	./go-deb --keep-files --repo go.wit.com/apps/go-deb
diff --git a/argv.go b/argv.go
index da2e4ba..ea8bb4d 100644
--- a/argv.go
+++ b/argv.go
@@ -15,7 +15,6 @@ type args struct {
 	Commit    *EmptyCmd `arg:"subcommand:commit"        help:"'git commit' but errors out if on wrong branch"`
 	Show      *EmptyCmd `arg:"subcommand:show"          help:"show what would be done"`
 	Gui       *EmptyCmd `arg:"subcommand:gui"           help:"open the gui"`
-	Auto      bool      `arg:"--auto"                   help:"automatically attempt to make the .deb"`
 	Ldflags   []string  `arg:"--ldflags"                help:"flags to pass to go build"`
 	Forge     string    `arg:"--forge"                  help:"use a git repo from forge"`
 	OutDir    string    `arg:"--dir"                    help:"write .deb file into this directory"`
@@ -23,8 +22,6 @@ type args struct {
 	KeepFiles bool      `arg:"--keep-files"             help:"keep the build files/"`
 	Force     bool      `arg:"--force" default:"false"  help:"force overwrite an existing .deb file"`
 	Verbose   bool      `arg:"--verbose"                help:"show more things"`
-	Bash      bool      `arg:"--bash"                   help:"generate bash completion"`
-	BashAuto  []string  `arg:"--auto-complete"          help:"todo: move this to go-arg"`
 }
 
 func (args) Version() string {
diff --git a/buildPackage.go b/buildPackage.go
index b57dcfe..9c5bdfa 100644
--- a/buildPackage.go
+++ b/buildPackage.go
@@ -14,7 +14,7 @@ import (
 	"go.wit.com/log"
 )
 
-func (c *controlBox) buildPackage() (bool, error) {
+func buildPackage(c *controlBox) (bool, error) {
 	// TODO: if dirty, set GO111MODULE
 	// also, if last tag != version
 	/*
@@ -48,11 +48,7 @@ func (c *controlBox) buildPackage() (bool, error) {
 	}
 	if shell.Exists(fulldebname) {
 		log.Info("debian package already built: " + fulldebname)
-		if argv.Auto {
-			return true, errors.New("debian package already built: " + fulldebname)
-		} else {
-			return false, errors.New("debian package already built: " + fulldebname)
-		}
+		return true, errors.New("debian package already built: " + fulldebname)
 
 	}
 
diff --git a/doGui.go b/doGui.go
new file mode 100644
index 0000000..38973a5
--- /dev/null
+++ b/doGui.go
@@ -0,0 +1,31 @@
+// Copyright 2017-2025 WIT.COM Inc. All rights reserved.
+// Use of this source code is governed by the GPL 3.0
+
+package main
+
+// An app to submit patches for the 30 GO GUI repos
+
+import (
+	"os"
+
+	"go.wit.com/gui"
+	"go.wit.com/lib/gadgets"
+	"go.wit.com/log"
+)
+
+func doGui() {
+	win := gadgets.NewGenericWindow("testing", "Current Conversations")
+	win.Custom = func() {
+		log.Warn("MAIN WINDOW CLOSE")
+		gui.StandardExit()
+		os.Exit(0)
+	}
+
+	grid := win.Group.RawGrid()
+
+	grid.NewLabel("label worked")
+	grid.NextRow()
+
+	grid.NewButton("more", func() {
+	})
+}
diff --git a/main.go b/main.go
index 205e90f..f6e358c 100644
--- a/main.go
+++ b/main.go
@@ -9,7 +9,6 @@ import (
 	"go.wit.com/dev/alexflint/arg"
 	"go.wit.com/lib/fhelp"
 	"go.wit.com/lib/gui/prep"
-	"go.wit.com/lib/gui/shell"
 	"go.wit.com/lib/protobuf/forgepb"
 	"go.wit.com/log"
 )
@@ -87,27 +86,22 @@ func main() {
 		log.Warn("scan failed")
 	}
 	me.cBox.computeControlValues()
-	// verify the values for the package
-
-	if argv.Auto {
-		shell.TestTerminalColor()
-		// basicWindow.Show() // broken gui package. convert to protobuf
-		if ok, err := me.cBox.buildPackage(); ok {
-			log.Info("build worked")
-		} else {
-			log.Warn("build failed:", err)
-			os.Exit(-1)
-		}
-		os.Exit(0)
-	}
 
 	if argv.Gui != nil {
 		// only load teh toolkit if you get this far
 		me.myGui.Start() // loads the GUI toolkit
+		doGui()
 		me.basicWindow.Show()
 		debug()
 	}
-	log.Info("go-deb: nothing to do in argv")
+
+	log.Info("go-deb: attempting to build package")
+	if ok, err := buildPackage(me.cBox); ok {
+		log.Info("build worked")
+	} else {
+		log.Warn("build failed:", err)
+		os.Exit(-1)
+	}
 	os.Exit(0)
 }
 
diff --git a/stateWindow.go b/stateWindow.go
index b04a5f3..a0cc7a1 100644
--- a/stateWindow.go
+++ b/stateWindow.go
@@ -35,7 +35,7 @@ func makebasicWindow() *gadgets.BasicWindow {
 
 	group1.NewButton("Make .deb", func() {
 		win.Disable()
-		if ok, err := me.cBox.buildPackage(); ok {
+		if ok, err := buildPackage(me.cBox); ok {
 			log.Info("build worked")
 			os.Exit(0)
 		} else {