more cleanups

Signed-off-by: Jeff Carr <jcarr@wit.com>

globalTestingOptions.go

@@ -39,7 +39,6 @@ func attemptAutoRebuild() {
 
 	homeDir := me.userHomePwd.String()
 	fullpath := filepath.Join(homeDir, "go")
-	// fullpath := "/home/jcarr/go/"
 	quickCmd(fullpath, []string{"mkdir", "-p", "src/go.wit.com/apps/"})
 
 	fullpath = filepath.Join(homeDir, "go/src/go.wit.com/apps/")

repolist.go

@@ -120,10 +120,8 @@ func addRepo(grid *gui.Node, path string, master string, devel string, user stri
 		}
 		log.Warn("status window exists. trying TestDraw() here")
 		newRepo.status.Toggle()
-		/// newRepo.status.Update()
 	})
 
-	// newRepo.status = repostatus.New(me.myGui, newRepo.path)
 	newRepo.status = repostatus.NewRepoStatusWindow(newRepo.path)
 	newRepo.hidden = false
 	newRepo.status.SetMainWorkingName(master)
@@ -185,12 +183,14 @@ func repolistWindow() {
 		addRepo(reposgrid, path, mbranch, dbranch, ubranch)
 	}
 
+	/*
 	for i, path := range repostatus.ListGitDirectories() {
 		// log.Info("addRepo()", i, path)
-		tmp := strings.TrimPrefix(path, "/home/jcarr/go/src/")
+		tmp := strings.TrimPrefix(path, me.goSrcPwd.String())
 		log.Info("addRepo()", i, tmp)
 		addRepo(reposgrid, tmp, "master", "master", "master")
 	}
+	*/
 
 	reposgroup.NewButton("merge all user to devel", func() {
 		reposwin.Disable()

scan.go

@@ -3,6 +3,7 @@ package main
 
 import (
 	"fmt"
+	"os/user"
 	"time"
 
 	"go.wit.com/log"
@@ -38,7 +39,8 @@ func (r *repo) newScan() bool {
 
 	uname := r.status.GetUserBranchName()
 	uver := r.status.GetUserVersion()
-	if uname != "jcarr" {
+	usr, _ := user.Current()
+	if uname != usr.Username {
 		uver = uver + " (" + uname + ")"
 	}
 	r.userVersion.SetLabel(uver)

structs.go

@@ -67,12 +67,6 @@ type autoType struct {
 	deleteGoSrcPkgB *gui.Node
 }
 
-/*
-var cmds *gui.Node
-var doit *gui.Node
-var dryrun *gui.Node
-*/
-
 type repo struct {
 	hidden     bool
 	path       string
@@ -80,18 +74,15 @@ type repo struct {
 	lasttag    string
 
 	pLabel *gui.Node // path label
-	// bLabel *gui.Node // branch label
+
 	lastTag     *gui.Node // last tagged version label
 	vLabel      *gui.Node // version label
 	dirtyLabel  *gui.Node // git state (dirty or not?)
 	goSumStatus *gui.Node // what is the state of the go.sum file
 
-	// masterName    *gui.Node // the master branch name
 	masterVersion *gui.Node // the master branch version
-	// develName     *gui.Node // the devel branch name
+	develVersion  *gui.Node // the devel branch version
-	develVersion *gui.Node // the devel branch version
+	userVersion   *gui.Node // the user branch version
-	// userName      *gui.Node // the jcarr branch name
-	userVersion *gui.Node // the jcarr branch version
 
 	statusButton *gui.Node // opens up the status window