diff options
Diffstat (limited to 'globalBuildOptions.go')
| -rw-r--r-- | globalBuildOptions.go | 90 |
1 files changed, 46 insertions, 44 deletions
diff --git a/globalBuildOptions.go b/globalBuildOptions.go index 043892e..8708425 100644 --- a/globalBuildOptions.go +++ b/globalBuildOptions.go @@ -3,6 +3,7 @@ package main import ( "os" + "os/user" "path/filepath" "go.wit.com/log" @@ -66,8 +67,9 @@ func globalBuildOptions(box *gui.Node) { me.develBranch = gadgets.NewBasicCombobox(grid, "default devel branch") me.develBranch.AddText("devel") + usr, _ := user.Current() me.userBranch = gadgets.NewBasicCombobox(grid, "default user branch") - me.userBranch.AddText("jcarr") + me.userBranch.AddText(usr.Username) grid.NewLabel("<nil>") grid.NewButton("set working branches", func() { @@ -89,12 +91,10 @@ func globalBuildOptions(box *gui.Node) { */ }) newBranch = grid.NewCombobox() - newBranch.AddText("guimaster") newBranch.AddText("master") - newBranch.AddText("main") - newBranch.AddText("guidevel") - newBranch.AddText("jcarr") - newBranch.SetText("jcarr") + newBranch.AddText("devel") + newBranch.AddText(usr.Username) + newBranch.SetText(usr.Username) me.autoWorkingPwd = gadgets.NewOneLiner(grid, "working directory (pwd)") me.userHomePwd = gadgets.NewOneLiner(grid, "user home") @@ -116,49 +116,51 @@ func globalBuildOptions(box *gui.Node) { me.autoDryRun = group2.NewCheckbox("autotypist --dry-run") me.autoDryRun.SetChecked(true) - group2.NewButton("parse .git/config ScanGitConfig()", func() { - repostatus.ScanGitConfig() - }) + /* + group2.NewButton("parse .git/config ScanGitConfig()", func() { + repostatus.ScanGitConfig() + }) - group2.NewButton("parse go.sum ScanGoSrc()", func() { - repostatus.ScanGoSrc() - }) + group2.NewButton("parse go.sum ScanGoSrc()", func() { + repostatus.ScanGoSrc() + }) - group2.NewButton("run git status", func() { - me.autoWorkingPwd.SetValue("~/go/src") - log.Warn("scanning allrepos") - for path, _ := range me.allrepos { - fullpath := "/home/jcarr/go/src/" + path - quickCmd(fullpath, []string{"git", "status"}) - } - }) + group2.NewButton("run git status", func() { + me.autoWorkingPwd.SetValue("~/go/src") + log.Warn("scanning allrepos") + for path, _ := range me.allrepos { + fullpath := me.goSrcPwd.String() + path + quickCmd(fullpath, []string{"git", "status"}) + } + }) - me.rerunGoMod = group2.NewButton("remove go.mod & go.sum", func() { - for path, _ := range me.allrepos { - fullpath := "/home/jcarr/go/src/" + path - if quickCmd(fullpath, []string{"rm", "-f", "go.mod", "go.sum"}) { - log.Info("rm go.mod FAILED in repo", fullpath, me.stopOnErrors.Bool()) - if me.stopOnErrors.Bool() { - return + me.rerunGoMod = group2.NewButton("remove go.mod & go.sum", func() { + for path, _ := range me.allrepos { + fullpath := me.goSrcPwd.String() + path + if quickCmd(fullpath, []string{"rm", "-f", "go.mod", "go.sum"}) { + log.Info("rm go.mod FAILED in repo", fullpath, me.stopOnErrors.Bool()) + if me.stopOnErrors.Bool() { + return + } } } - } - }) + }) - me.rerunGoMod = group2.NewButton("run go mod & go tidy", func() { - os.Unsetenv("GO111MODULE") - for path, _ := range me.allrepos { - fullpath := "/home/jcarr/go/src/" + path - quickCmd(fullpath, []string{"go", "mod", "init"}) - quickCmd(fullpath, []string{"go", "mod", "tidy"}) - } - }) + me.rerunGoMod = group2.NewButton("run go mod & go tidy", func() { + os.Unsetenv("GO111MODULE") + for path, _ := range me.allrepos { + fullpath := me.goSrcPwd.String() + path + quickCmd(fullpath, []string{"go", "mod", "init"}) + quickCmd(fullpath, []string{"go", "mod", "tidy"}) + } + }) - me.rerunGoMod = group2.NewButton("git checkout go.mod & go.sum", func() { - for path, _ := range me.allrepos { - fullpath := "/home/jcarr/go/src/" + path - quickCmd(fullpath, []string{"git", "checkout", "go.mod"}) - quickCmd(fullpath, []string{"git", "checkout", "go.sum"}) - } - }) + me.rerunGoMod = group2.NewButton("git checkout go.mod & go.sum", func() { + for path, _ := range me.allrepos { + fullpath := me.goSrcPwd.String() + path + quickCmd(fullpath, []string{"git", "checkout", "go.mod"}) + quickCmd(fullpath, []string{"git", "checkout", "go.sum"}) + } + }) + */ } |