more argv cleanups

1 files changed, 25 insertions, 23 deletions

diff --git a/main.go b/main.go
index 05e72a6..5a4a0a6 100644
--- a/main.go
+++ b/main.go
@@ -51,31 +51,33 @@ func main() {
 	me.forge = forgepb.Init()
 	me.found = new(gitpb.Repos)
 
-	if argv.User != nil {
-		me.forge.CheckoutUser()
-		me.forge = forgepb.Init()
-		me.found = new(gitpb.Repos)
-		argv.User.findRepos()
-		doCobol()
-		okExit("")
-	}
+	if argv.Checkout != nil {
+		if argv.Checkout.User != nil {
+			me.forge.CheckoutUser()
+			me.forge = forgepb.Init()
+			me.found = new(gitpb.Repos)
+			argv.Checkout.User.findRepos()
+			doCobol()
+			okExit("")
+		}
 
-	if argv.Devel != nil {
-		me.forge.CheckoutDevel()
-		me.forge = forgepb.Init()
-		me.found = new(gitpb.Repos)
-		argv.Devel.findRepos()
-		doCobol()
-		okExit("")
-	}
+		if argv.Checkout.Devel != nil {
+			me.forge.CheckoutDevel()
+			me.forge = forgepb.Init()
+			me.found = new(gitpb.Repos)
+			argv.Checkout.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("")
+		if argv.Checkout.Master != nil {
+			me.forge.CheckoutMaster()
+			me.forge = forgepb.Init()
+			me.found = new(gitpb.Repos)
+			argv.Checkout.Master.findRepos()
+			doCobol()
+			okExit("")
+		}
 	}
 
 	if argv.Register != "" {