fix non-recursive clone

2 files changed, 34 insertions, 29 deletions

diff --git a/clone.go b/clone.go
index e28957a..dbec873 100644
--- a/clone.go
+++ b/clone.go
@@ -80,6 +80,10 @@ func clone(gopath string) (*gitpb.Repo, error) {
 		log.Info("clone() could not download err:", err)
 		return nil, err
 	}
+	if argv.NonRecursive {
+		// clone and nothing else
+		return pb, nil
+	}
 
 	autoWork()
 	if err := makeValidGoSum(pb); err != nil {
diff --git a/main.go b/main.go
index 69c0952..ed50a20 100644
--- a/main.go
+++ b/main.go
@@ -31,42 +31,43 @@ func main() {
 	if err != nil {
 		badExit(err)
 	}
-
-	if !argv.NonRecursive {
-		log.Info("STARTING RECURSIVE CLONE", workingRepo.GetGoPath())
-		if err := recursiveClone(workingRepo); err != nil {
-			badExit(err)
+	if argv.NonRecursive {
+		if argv.AutoWork {
+			autoWork()
 		}
-	}
-	autoWork()
-	if argv.Build {
-		log.Info("STARTING BUILD", workingRepo.GetGoPath())
-		/*
-			if err := makeValidGoSum(workingRepo); err != nil {
-				badExit(err)
+		if argv.Build {
+			log.Info("STARTING BUILD", workingRepo.GetGoPath())
+			/*
+				if err := makeValidGoSum(workingRepo); err != nil {
+					badExit(err)
+				}
+				if err := build(); err != nil {
+					badExit(err)
+				}
+			*/
+			if workingRepo.GetRepoType() == "binary" || workingRepo.GetRepoType() == "plugin" {
+				log.Info("build will probably fail", workingRepo.GetGoPath(), "is", workingRepo.GetRepoType())
 			}
-			if err := build(); err != nil {
+			if err := forge.Build(workingRepo, nil); err != nil {
+				log.Warn("BUILD FAILED", workingRepo.GetGoPath(), err)
 				badExit(err)
 			}
-		*/
-		if workingRepo.GetRepoType() == "binary" || workingRepo.GetRepoType() == "plugin" {
-			log.Info("build will probably fail", workingRepo.GetGoPath(), "is", workingRepo.GetRepoType())
 		}
-		if err := forge.Build(workingRepo, nil); err != nil {
-			log.Warn("BUILD FAILED", workingRepo.GetGoPath(), err)
-			badExit(err)
+		if argv.Install {
+			log.Info("STARTING INSTALL", workingRepo.GetGoPath())
+			// can only install binary or plugin go packages
+			if workingRepo.GetRepoType() == "binary" || workingRepo.GetRepoType() == "plugin" {
+				log.Info("install will probably fail", workingRepo.GetGoPath(), "is", workingRepo.GetRepoType())
+			}
+			if err := forge.Install(workingRepo, nil); err != nil {
+				log.Warn("INSTALL FAILED", workingRepo.GetGoPath(), err)
+				badExit(err)
+			}
 		}
 	}
-	if argv.Install {
-		log.Info("STARTING INSTALL", workingRepo.GetGoPath())
-		// can only install binary or plugin go packages
-		if workingRepo.GetRepoType() == "binary" || workingRepo.GetRepoType() == "plugin" {
-			log.Info("install will probably fail", workingRepo.GetGoPath(), "is", workingRepo.GetRepoType())
-		}
-		if err := forge.Install(workingRepo, nil); err != nil {
-			log.Warn("INSTALL FAILED", workingRepo.GetGoPath(), err)
-			badExit(err)
-		}
+	log.Info("STARTING RECURSIVE CLONE", workingRepo.GetGoPath())
+	if err := recursiveClone(workingRepo); err != nil {
+		badExit(err)
 	}
 	okExit("")
 }