rename to 'argv'; use standard -ldflagsv0.5.3

1 files changed, 20 insertions, 16 deletions

diff --git a/main.go b/main.go
index 6972703..36ed05f 100644
--- a/main.go
+++ b/main.go
@@ -14,25 +14,21 @@ import (
 	"go.wit.com/log"
 )
 
-var Version string
+// sent from -ldflags
+var VERSION string
 
 var rv *repolist.RepoList
-var myargs args
 
 func main() {
-	pp := arg.MustParse(&myargs)
+	pp := arg.MustParse(&argv)
 
-	if myargs.Repo == "" {
+	if argv.Repo == "" {
 		pp.WriteHelp(os.Stdout)
 		os.Exit(0)
 	}
 
-	if myargs.Repo == "version" {
-		log.Info(Version)
-		os.Exit(0)
-	}
-
-	if myargs.Repo == "version" || myargs.Repo == "help" || myargs.Repo == "?" {
+	// for very new users or users unfamilar with the command line, this may help them
+	if argv.Repo == "version" || argv.Repo == "help" || argv.Repo == "?" {
 		pp.WriteHelp(os.Stdout)
 		os.Exit(0)
 	}
@@ -52,13 +48,21 @@ func main() {
 	rv = repolist.AutotypistView(b)
 
 	os.Setenv("REPO_AUTO_CLONE", "true")
-	newr, err := rv.NewRepo(myargs.Repo)
+	newr, err := rv.NewRepo(argv.Repo)
 	if err != nil {
 		log.Info("could not download:", err)
 		os.Exit(-1)
 	}
 	newr.Status.MakeRedomod()
 
+	fullgitdir := filepath.Join(wdir, argv.Repo, ".git")
+	if shell.IsDir(fullgitdir) {
+		log.Info("repo already cloned", filepath.Join(wdir, argv.Repo))
+		os.Exit(0)
+	}
+
+	log.Info("scanning for repo in:", filepath.Join(wdir, argv.Repo))
+
 	// rv.NewRepo("go.wit.com/apps/helloworld")
 	for _, path := range repostatus.ScanGitDirectories(wdir) {
 		gopath := strings.TrimPrefix(path, wdir)
@@ -68,7 +72,7 @@ func main() {
 	}
 
 	godep := newr.Status.GetGoDeps()
-	if myargs.Recursive {
+	if argv.Recursive {
 		for gopath, version := range godep {
 			repo, err := rv.NewRepo(gopath)
 			if err != nil {
@@ -88,8 +92,8 @@ func main() {
 	}
 
 	log.Info("Total repositories:", count)
-	log.Info("Finished go-clone for", myargs.Repo)
-	if !myargs.NoWork {
+	log.Info("Finished go-clone for", argv.Repo)
+	if !argv.NoWork {
 		log.Info("Creating", wdir+"/go.work")
 		rv.MakeGoWork()
 		shell.RunPath(wdir, []string{"go", "work", "use"})
@@ -105,7 +109,7 @@ func main() {
 // look for or make a go.work file
 // otherwise use ~/go/src
 func findWorkFile() (string, error) {
-	if myargs.GoSrc {
+	if argv.GoSrc {
 		// user put --go-src on the command line so use ~/go/src
 		return useGoSrc()
 	}
@@ -120,7 +124,7 @@ func findWorkFile() (string, error) {
 		}
 
 		// if the user added '--work' on the cmdline, make a work directory and init the go.work file
-		if ! myargs.NoWork {
+		if !argv.NoWork {
 			pwd, err = os.Getwd()
 			newpwd := filepath.Join(pwd, "work")
 			shell.Mkdir(newpwd)