diff options
| -rw-r--r-- | argv.go | 6 | ||||
| -rw-r--r-- | doVerify.go | 4 | ||||
| -rw-r--r-- | main.go | 4 | ||||
| -rw-r--r-- | structs.go | 6 |
4 files changed, 11 insertions, 9 deletions
@@ -9,7 +9,7 @@ import ( "go.wit.com/gui" "go.wit.com/lib/debugger" "go.wit.com/lib/fhelp" - "go.wit.com/lib/gui/prep" + "go.wit.com/lib/protobuf/argvpb" ) /* @@ -180,7 +180,7 @@ type ConfigAddCmd struct { func (args) Version() string { // log.Info(me.sh.Version()) // return ARGNAME + " " + VERSION + " Built on " + BUILDTIME - return prep.StandardVersion(ARGNAME, VERSION, BUILDTIME) + return argvpb.StandardVersion(ARGNAME, VERSION, BUILDTIME) } func (args) Buildtime() (string, string) { @@ -240,7 +240,7 @@ func (args) Examples() string { } // sends the strings to bash or zsh that will be your options -func (a args) SendCompletionStrings(pb *prep.Auto) { +func (a args) SendCompletionStrings(pb *argvpb.Argv) { if pb.Cmd == "" { // these are base autocomplete strings matches := []string{"clean", "commit", "merge", "patch", "normal", "pull", "rebuild"} diff --git a/doVerify.go b/doVerify.go index 5317183..8b7811f 100644 --- a/doVerify.go +++ b/doVerify.go @@ -7,7 +7,7 @@ import ( "errors" "path/filepath" - "go.wit.com/lib/gui/prep" + "go.wit.com/lib/protobuf/argvpb" "go.wit.com/lib/protobuf/gitpb" "go.wit.com/log" ) @@ -69,7 +69,7 @@ func doVerifyNamespace() (string, error) { err = errors.New(log.Sprintf("%d namespaces were invalid", counter)) } - if prep.DryRun() { + if argvpb.DryRun() { return s, err } if counter != 0 { @@ -8,8 +8,8 @@ package main import ( "embed" - "go.wit.com/lib/gui/prep" "go.wit.com/lib/gui/shell" + "go.wit.com/lib/protobuf/argvpb" "go.wit.com/lib/protobuf/forgepb" "go.wit.com/log" ) @@ -34,7 +34,7 @@ func main() { // autocomplete must run before everythingi // any writes before this to STDOUT or STDERR // will cause problems for the user at the command line - me.sh = prep.Autocomplete(&argv) // adds shell auto complete to go-args + me.sh = argvpb.Autocomplete(&argv) // adds shell auto complete to go-args // the current forge init process me.forge, err = forgepb.Init() // init forge.pb @@ -7,10 +7,12 @@ import ( "go.wit.com/gui" "go.wit.com/lib/fhelp" "go.wit.com/lib/gadgets" - "go.wit.com/lib/gui/prep" + "go.wit.com/lib/protobuf/argvpb" "go.wit.com/lib/protobuf/forgepb" ) +// var newargv *argvpb.Argv // more experiments for bash handling + var me *mainType func (b *mainType) Disable() { @@ -28,7 +30,7 @@ func myServer() string { // this app's variables type mainType struct { - sh *prep.Auto // shell autocomplete + sh *argvpb.Argv // shell autocomplete forge *forgepb.Forge // for holding the forge protobuf files myGui *fhelp.GuiPrep // for initializing the GUI toolkits origGui *gui.Node // for initializing the GUI toolkits |