1 files changed, 32 insertions, 9 deletions
diff --git a/main.go b/main.go
index 330bc8e..20f2930 100644
--- a/main.go
+++ b/main.go
@@ -41,13 +41,30 @@ func main() {
 	me.forge = forgepb.Init()
 	me.found = new(gitpb.Repos)
 
-	if argv.User {
+	if argv.User != nil {
 		me.forge.CheckoutUser()
+		me.forge = forgepb.Init()
+		me.found = new(gitpb.Repos)
+		argv.User.findRepos()
+		doCobol()
 		okExit("")
 	}
 
-	if argv.Master {
+	if argv.Devel != nil {
+		me.forge.CheckoutDevel()
+		me.forge = forgepb.Init()
+		me.found = new(gitpb.Repos)
+		argv.Devel.findRepos()
+		doCobol()
+		okExit("")
+	}
+
+	if argv.Master != nil {
 		me.forge.CheckoutMaster()
+		me.forge = forgepb.Init()
+		me.found = new(gitpb.Repos)
+		argv.Master.findRepos()
+		doCobol()
 		okExit("")
 	}
 
@@ -75,37 +92,39 @@ func main() {
 			me.forge.ConfigPrintTable()
 			okExit("")
 		}
-	} else {
-		findRepos()
 	}
-	// okExit("")
 
 	log.Info("found", me.found.Len(), "repos. found", len(me.foundPaths), "paths from .config/forge")
 
 	// now, do something to all of them (or just print out a table of them)
 	var done bool = false
 	if argv.Dirty {
+		findRepos(argv.Find)
 		doCheckDirty()
 		okExit("")
 		done = true
 	}
 
 	if argv.Scan {
+		findRepos(argv.Find)
 		doScan()
 		done = true
 	}
 
-	if argv.GitPull {
+	if argv.GitPull != nil {
+		argv.GitPull.findRepos()
 		doGitPull()
 		done = true
 	}
 
 	if argv.GitReset {
+		findRepos(argv.Find)
 		doGitReset()
 		done = true
 	}
 
-	if argv.List {
+	if argv.List != nil {
+		argv.List.findRepos()
 		// print out the repos
 		doCobol()
 		done = true
@@ -136,7 +155,11 @@ func main() {
 			okExit("")
 		}
 	}
-	// open the gui
-	doGui()
+	// open the gui unless the user performed some other
+	// things from the command line
+	// basically, if you run just 'forge' it'll open the GUI
+	if !done {
+		doGui()
+	}
 	okExit("")
 }