From 77c1b9258f5de5ec0e8a5d3b69c1f3cf7143c154 Mon Sep 17 00:00:00 2001 From: Jeff Carr Date: Mon, 15 Jan 2024 12:43:08 -0600 Subject: attempt to rebuild autotypist Signed-off-by: Jeff Carr --- main.go | 27 ++++++++++++++++++++++----- 1 file changed, 22 insertions(+), 5 deletions(-) (limited to 'main.go') diff --git a/main.go b/main.go index 4d8de8e..4c682f6 100644 --- a/main.go +++ b/main.go @@ -9,7 +9,7 @@ import ( "go.wit.com/gui/gui" "go.wit.com/gui/gadgets" - "go.wit.com/gui/gadgets/repostatus" + "go.wit.com/gui/tools/repostatus" ) //go:embed plugins/* @@ -93,7 +93,7 @@ func addRepo(grid *gui.Node, path string, master string, devel string, user stri // This creates a window func repoworld() { - reposwin = gadgets.NewBasicWindow(myGui, "git autotypist. it types faster than you can.") + reposwin = gadgets.NewBasicWindow(myGui, "autotypist for GO & git. it types faster than you can.") reposwin.Make() reposbox = reposwin.Box().NewBox("bw vbox", false) @@ -178,9 +178,17 @@ func repoworld() { buildOptions.NewLabel("get autotypist") buildOptions.NewButton("go get", func () { var newCmds [][]string - newCmds = append(newCmds, []string{"mkdir", "-p", "go/src/go.wit.com/myrepos"}) - newCmds = append(newCmds, []string{"cd", "go/src/go.wit.com/myrepos"}) - newCmds = append(newCmds, []string{"go", "git", "-v", "-u"}) + newCmds = append(newCmds, []string{"mkdir", "-p", "go/src/go.wit.com/apps"}) + newCmds = append(newCmds, []string{"cd", "go/src/go.wit.com/apps/myrepos"}) + newCmds = append(newCmds, []string{"go", "get", "-v", "-u", "go.wit.com/apps/myrepos"}) + newCmds = append(newCmds, []string{"cd", "go/src/go.wit.com/apps/myrepos"}) + newCmds = append(newCmds, []string{"go", "get", "-v", "-u", "."}) + newCmds = append(newCmds, []string{"go", "get", "-v", "-u", "go.wit.com/gui/toolkits"}) + newCmds = append(newCmds, []string{"cd", "go/src/go.wit.com/gui/toolkits"}) + newCmds = append(newCmds, []string{"go", "get", "-v", "-u", "."}) + newCmds = append(newCmds, []string{"go", "make"}) + newCmds = append(newCmds, []string{"cd", "go/src/go.wit.com/apps/myrepos"}) + newCmds = append(newCmds, []string{"go", "make"}) script = newCmds setGitCommands() doit.Enable() @@ -200,6 +208,15 @@ func repoworld() { buildOptions.NewLabel("cmd") cmds = buildOptions.NewLabel("ls") + buildOptions.NewLabel("--dry-run") + dryrun = buildOptions.NewButton("show commands", func () { + if dryRunCommands() { + log.Warn("EVERYTHING MIGHT HAVE WORKED") + } else { + log.Warn("EVERYTHING DID NOT WORK") + } + }) + buildOptions.NewLabel("Doit") doit = buildOptions.NewButton("run commands", func () { doit.Disable() -- cgit v1.2.3