use new forge.Init()

4 files changed, 31 insertions, 99 deletions

diff --git a/argv.go b/argv.go
index 17c036e..0a5a453 100644
--- a/argv.go
+++ b/argv.go
@@ -1,5 +1,10 @@
 package main
 
+import (
+	"fmt"
+	"os"
+)
+
 /*
 	this parses the command line arguements
 */
@@ -35,3 +40,16 @@ go-mod-clean will try to verify your go.* files are using the newest package ver
 * Try to trim go.sum of non-existent entries
 `
 }
+
+func (a args) DoAutoComplete(argv []string) {
+	switch argv[0] {
+	case "checkout":
+		fmt.Println("user devel master ")
+	default:
+		if argv[0] == ARGNAME {
+			// list the subcommands here
+			fmt.Println("strict restore purge lax")
+		}
+	}
+	os.Exit(0)
+}
diff --git a/argvAutoshell.go b/argvAutoshell.go
deleted file mode 100644
index 3370828..0000000
--- a/argvAutoshell.go
+++ /dev/null
@@ -1,82 +0,0 @@
-// Copyright 2017-2025 WIT.COM Inc. All rights reserved.
-// Use of this source code is governed by the GPL 3.0
-
-package main
-
-import (
-	"fmt"
-	"os"
-)
-
-/*
-	handles shell autocomplete
-*/
-
-// used for shell auto completion
-// var ARGNAME string = "forge" // todo: get this from $0 ?
-
-func deleteMatch() {
-	// f := forgedb.InitSimple()
-	fmt.Println("go.wit.com/lib/gui/repostatus todo: need to do this")
-}
-
-func (args) doBashAuto() {
-	argv.doBashHelp()
-	switch argv.BashAuto[0] {
-	case "checkout":
-		fmt.Println("user devel master ")
-	default:
-		if argv.BashAuto[0] == ARGNAME {
-			// list the subcommands here
-			fmt.Println("strict restore purge lax")
-		}
-	}
-	os.Exit(0)
-}
-
-// prints help to STDERR // TODO: move everything below this to go-args
-func (args) doBashHelp() {
-	if argv.BashAuto[1] != "''" {
-		// if this is not blank, then the user has typed something
-		return
-	}
-	if argv.BashAuto[0] != ARGNAME {
-		// if this is not the name of the command, the user already started doing something
-		return
-	}
-	if argv.BashAuto[0] == ARGNAME {
-		// pp.WriteHelp(os.Stderr)
-		return
-	}
-}
-
-// complete -F forge --bash forge
-func (args) doBash() {
-	fmt.Println("# add this in your bashrc:")
-	fmt.Println("")
-	fmt.Println("# todo: add this to go-arg as a 'hidden' go-arg option --bash")
-	fmt.Println("#")
-	fmt.Println("# todo: can this output work/parse with:")
-	fmt.Println("# complete -C `" + ARGNAME + " --bash` " + ARGNAME)
-	fmt.Println("")
-	fmt.Println("_" + ARGNAME + "_complete()")
-	fmt.Println("{")
-	fmt.Println("	# sets local to this func vars")
-	fmt.Println("	local cur prev all")
-	fmt.Println("	cur=${COMP_WORDS[COMP_CWORD]}")
-	fmt.Println("	prev=${COMP_WORDS[COMP_CWORD-1]}")
-	fmt.Println("	all=${COMP_WORDS[@]}")
-	fmt.Println("")
-	fmt.Println("	# this is where we generate the go-arg output")
-	fmt.Println("        GOARGS=$(" + ARGNAME + " --auto-complete $prev \\'$cur\\' $all)")
-	fmt.Println("")
-	fmt.Println("	# this compares the command line input from the user")
-	fmt.Println("	# to whatever strings we output")
-	fmt.Println("        COMPREPLY=( $(compgen -W \"$GOARGS\" -- $cur) )  # THIS WORKS")
-	fmt.Println("	return 0")
-	fmt.Println("}")
-	fmt.Println("complete -F _" + ARGNAME + "_complete " + ARGNAME)
-	fmt.Println("")
-	fmt.Println("# copy and paste the above into your bash shell should work")
-	os.Exit(0)
-}
diff --git a/config.go b/config.go
index 3a98777..d7684b1 100644
--- a/config.go
+++ b/config.go
@@ -3,12 +3,17 @@ package main
 import (
 	"go.wit.com/lib/config"
 	"go.wit.com/lib/protobuf/forgepb"
+	"go.wit.com/log"
 )
 
 // sent via -ldflags
 
-func configInit() (*forgepb.ForgeConfigs, error) {
+func configInit() *forgepb.ForgeConfigs {
 	configs := new(forgepb.ForgeConfigs)
 	err := config.ConfigLoad(configs, "forge", "forge")
-	return configs, err
+	if err != nil {
+		log.Info("This tool requires your repos be scanned by forge first")
+		badExit(nil, err)
+	}
+	return configs
 }
diff --git a/main.go b/main.go
index 1fe56b7..51e4d33 100644
--- a/main.go
+++ b/main.go
@@ -5,6 +5,7 @@ import (
 	"strings"
 
 	"go.wit.com/dev/alexflint/arg"
+	"go.wit.com/lib/gui/prep"
 	"go.wit.com/lib/protobuf/forgepb"
 	"go.wit.com/lib/protobuf/gitpb"
 	"go.wit.com/log"
@@ -25,25 +26,15 @@ var configSave bool
 
 func main() {
 	var check *gitpb.Repo
-	pp = arg.MustParse(&argv)
 
-	if argv.Bash {
-		argv.doBash()
-		os.Exit(0)
-	}
-	if len(argv.BashAuto) != 0 {
-		argv.doBashAuto()
-		os.Exit(0)
-	}
+	// command line parsing & handling
+	prep.Bash(ARGNAME, argv.DoAutoComplete) // todo: make this: prep.Bash(argv)
+	pp = arg.MustParse(&argv)
 
 	log.Info("go-mod-clean version", VERSION, "built on", BUILDTIME)
 
-	// load the ~/.config/forge/ config
-	cfg, err := configInit()
-	if err != nil {
-		log.Info("This tool requires your repos be scanned by forge first")
-		badExit(nil, err)
-	}
+	// read in forge info
+	cfg := configInit()
 	forge = forgepb.InitFromConfig(cfg)
 
 	// figure out what directory we are running in