general cleanups

Signed-off-by: Jeff Carr <[email protected]>

1 files changed, 14 insertions, 69 deletions

diff --git a/globalBuildOptions.go b/globalBuildOptions.go
index 8708425..5668e4f 100644
--- a/globalBuildOptions.go
+++ b/globalBuildOptions.go
@@ -60,6 +60,20 @@ func globalBuildOptions(box *gui.Node) {
 	group1 := vbox.NewGroup("Global Build Options")
 	grid := group1.NewGrid("buildOptions", 2, 1)
 
+	// me.autoWorkingPwd = gadgets.NewOneLiner(grid, "working directory (pwd)")
+	me.userHomePwd = gadgets.NewOneLiner(grid, "user home")
+	me.goSrcPwd = gadgets.NewOneLiner(grid, "go src home")
+
+	usr, _ := user.Current()
+	homeDir, err := os.UserHomeDir()
+	if err != nil {
+		log.Warn("Error getting home directory:", err)
+		homeDir = "/home/autotypist"
+	}
+	me.userHomePwd.SetText(homeDir)
+	srcDir := filepath.Join(homeDir, "go/src")
+	me.goSrcPwd.SetText(srcDir)
+
 	me.mainBranch = gadgets.NewBasicCombobox(grid, "default main branch")
 	me.mainBranch.AddText("gitea server default")
 	me.mainBranch.Disable()
@@ -67,7 +81,6 @@ 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(usr.Username)
 
@@ -95,72 +108,4 @@ func globalBuildOptions(box *gui.Node) {
 	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")
-	me.goSrcPwd = gadgets.NewOneLiner(grid, "go src home")
-
-	homeDir, err := os.UserHomeDir()
-	if err != nil {
-		log.Warn("Error getting home directory:", err)
-		homeDir = "/home/autotypist"
-	}
-	me.userHomePwd.SetText(homeDir)
-	srcDir := filepath.Join(homeDir, "go/src")
-	me.goSrcPwd.SetText(srcDir)
-
-	group2 := vbox.NewGroup("Run in every git repository")
-	me.stopOnErrors = group2.NewCheckbox("Stop on errors")
-	me.stopOnErrors.SetChecked(true)
-
-	me.autoDryRun = group2.NewCheckbox("autotypist --dry-run")
-	me.autoDryRun.SetChecked(true)
-
-	/*
-		group2.NewButton("parse .git/config ScanGitConfig()", func() {
-			repostatus.ScanGitConfig()
-		})
-
-		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 := 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 := 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 := 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 := me.goSrcPwd.String() + path
-				quickCmd(fullpath, []string{"git", "checkout", "go.mod"})
-				quickCmd(fullpath, []string{"git", "checkout", "go.sum"})
-			}
-		})
-	*/
 }