diff options
Diffstat (limited to 'main.go')
| -rw-r--r-- | main.go | 30 |
1 files changed, 15 insertions, 15 deletions
@@ -18,7 +18,7 @@ var resources embed.FS func main() { me = new(mainType) - me.argv = argvpb.Autocomplete(&argv) // adds shell auto complete to go-args + argvpb.Init(&argv, APPNAME, BUILDTIME, VERSION) // adds shell auto-complete // read in protobuf file me.pb = zoopb.NewPackages() @@ -26,7 +26,7 @@ func main() { if err := me.pb.Load(); err != nil { me.pb.BaseDir = env.GetPanic("BaseDir") me.pb.Save() - me.argv.GoodExit("created new pb file: " + me.pb.Filename + ". rerun mirrors.") + argvpb.GoodExit("created new pb file: " + me.pb.Filename + ". rerun mirrors.") } // force check the PB variable @@ -34,32 +34,32 @@ func main() { if me.pb.BaseDir != env.GetPanic("BaseDir") { me.pb.BaseDir = env.GetPanic("BaseDir") me.pb.Save() - me.argv.BadExit("pb.BaseDir is bank", nil) + argvpb.BadExit("pb.BaseDir is bank", nil) } if err := os.Chdir(me.pb.BaseDir); err != nil { - me.argv.BadExit("no '"+me.pb.BaseDir+"' directory", err) + argvpb.BadExit("no '"+me.pb.BaseDir+"' directory", err) } if !shell.IsDir("pool/") { - me.argv.BadExit("no "+filepath.Join(me.pb.BaseDir, "pool")+" directory", errors.New("mount -a ? missing wit/pool/")) + argvpb.BadExit("no "+filepath.Join(me.pb.BaseDir, "pool")+" directory", errors.New("mount -a ? missing wit/pool/")) } - if me.argv.GetCmd() == "" { + if argvpb.PB.GetCmd() == "" { // STANDARD START // walk for new .deb files s, err := doWalk() if err != nil { - me.argv.BadExit(s, err) + argvpb.BadExit(s, err) } // move files from inccoming into pooo/ s, err = doIncoming(me.pb) if err != nil { - me.argv.BadExit(s, err) + argvpb.BadExit(s, err) } - me.argv.GoodExit(s) + argvpb.GoodExit(s) // STANDARD START END } @@ -99,19 +99,19 @@ func main() { // move files to the right place s, err = doIncoming(me.pb) if err != nil { - me.argv.BadExit(s, err) + argvpb.BadExit(s, err) } // add the filenames to the .pb s, err = doWalk() if err != nil { - me.argv.BadExit(s, err) + argvpb.BadExit(s, err) } // verify all the packages s, err = doVerify() if err != nil { - me.argv.BadExit(s, err) + argvpb.BadExit(s, err) } // print a table of the newest packages @@ -121,7 +121,7 @@ func main() { err = doPurge() if err != nil { - me.argv.BadExit("could not purge dists/", err) + argvpb.BadExit("could not purge dists/", err) } // make and GPG sign the Release files @@ -153,7 +153,7 @@ func main() { */ if err != nil { - me.argv.BadExit(s, err) + argvpb.BadExit(s, err) } - me.argv.GoodExit(s) + argvpb.GoodExit(s) } |