cleanup argvv0.25.65

1 files changed, 16 insertions, 11 deletions

diff --git a/argv.go b/argv.go
index 2e967cb..e013e1b 100644
--- a/argv.go
+++ b/argv.go
@@ -19,9 +19,9 @@ type args struct {
 	Checkout *CheckoutCmd `arg:"subcommand:checkout"                  help:"'git checkout'"`
 	Clean    *CleanCmd    `arg:"subcommand:clean"                     help:"'git clean' + reset repos to original state"`
 	Commit   *CommitCmd   `arg:"subcommand:commit"                    help:"'git commit'"`
-	Config   *ConfigCmd   `arg:"subcommand:config"                    help:"show your .config/forge/ settings"`
 	Gui      *EmptyCmd    `arg:"subcommand:gui"                       help:"open the gui"`
 	Merge    *MergeCmd    `arg:"subcommand:merge"                     help:"merge branches"`
+	Normal   *ModeCmd     `arg:"subcommand:normal"                    help:"shortcut to 'forge mode normal'"`
 	Mode     *ModeCmd     `arg:"subcommand:mode"                      help:"sets the mode (hacking, merging, publishing)"`
 	Patch    *PatchCmd    `arg:"subcommand:patch"                     help:"work with patchsets"`
 	Pull     *PullCmd     `arg:"subcommand:pull"                      help:"'git pull'"`
@@ -83,14 +83,15 @@ type CommitCmd struct {
 }
 
 type DevCmd struct {
-	Build      string `arg:"--build"                  help:"build a repo"`
-	Install    string `arg:"--install"                help:"install a repo"`
-	BuildForge bool   `arg:"--forge-rebuild"          help:"download and rebuild forge"`
-	URL        string `arg:"--connect"                help:"forge url"`
-	DeleteUser bool   `arg:"--delete-user"            help:"delete all user branches (checks for safety)"`
-	Fix        bool   `arg:"--fix"                    help:"actually do it"`
-	Prune      bool   `arg:"--prune"                  help:"git fetch prune"`
-	Untracked  bool   `arg:"--untracked"              help:"git untracked file list"`
+	Config     *ConfigCmd `arg:"subcommand:config"                    help:"show your .config/forge/ settings"`
+	Build      string     `arg:"--build"                  help:"build a repo"`
+	Install    string     `arg:"--install"                help:"install a repo"`
+	BuildForge bool       `arg:"--forge-rebuild"          help:"download and rebuild forge"`
+	URL        string     `arg:"--connect"                help:"forge url"`
+	DeleteUser bool       `arg:"--delete-user"            help:"delete all user branches (checks for safety)"`
+	Fix        bool       `arg:"--fix"                    help:"actually do it"`
+	Prune      bool       `arg:"--prune"                  help:"git fetch prune"`
+	Untracked  bool       `arg:"--untracked"              help:"git untracked file list"`
 }
 
 type CleanCmd struct {
@@ -171,7 +172,9 @@ type ConfigAddCmd struct {
 }
 
 func (args) Version() string {
-	return ARGNAME + " " + VERSION + "    Built on " + BUILDTIME
+	// log.Info(me.sh.Version())
+	// return ARGNAME + " " + VERSION + "    Built on " + BUILDTIME
+	return prep.StandardVersion(ARGNAME, VERSION, BUILDTIME)
 }
 
 func (args) Buildtime() (string, string) {
@@ -185,6 +188,8 @@ func (a args) Description() string {
 forge -- a tool to manage lots of git repos. forge includes a GUI and TUI.
 
 	forge only executes the 'git' command. Everything it does, you can run by hand with 'git'.
+
+	Orginally written to maintain the +50 GO git repositories for the WIT Private Cloud
 `
 }
 
@@ -202,7 +207,7 @@ func (args) Appname() string {
 
 func (a args) DoAutoComplete(pb *prep.Auto) {
 	if pb.Cmd == "" {
-		pb.Autocomplete3([]string{"checkout", "clean", "commit", "config", "gui", "merge", "mode", "patch", "pull", "show", "add", "--version", "--force", "dev"})
+		pb.Autocomplete3([]string{"checkout", "clean", "commit", "gui", "merge", "mode", "patch", "pull", "show", "add", "--version", "--force", "dev", "normal"})
 	} else {
 		pb.SubCommand(pb.Goargs...)
 	}