From f3c2f8092cffae64f680c3227b5186d9b84bcaf5 Mon Sep 17 00:00:00 2001 From: Peter Aronoff Date: Thu, 5 Dec 2024 15:38:24 -0500 Subject: [PATCH] temp: start transition --- internal/cli/app.go | 7 +++++++ internal/cli/gitmirror.go | 14 ++++++++------ 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/internal/cli/app.go b/internal/cli/app.go index e67089a..6530863 100644 --- a/internal/cli/app.go +++ b/internal/cli/app.go @@ -22,6 +22,13 @@ func (app *appEnv) noOp() bool { return app.exitValue != exitSuccess } +func alternativeNewAppEnv(cmd string) *appEnv { + return &appEnv{ + cmd: cmd, + exitValue: exitSucess, + } +} + func newAppEnv(cfg *cfg) *appEnv { homeDir, err := os.UserHomeDir() if err != nil { diff --git a/internal/cli/gitmirror.go b/internal/cli/gitmirror.go index 007f048..8ee942e 100644 --- a/internal/cli/gitmirror.go +++ b/internal/cli/gitmirror.go @@ -52,11 +52,12 @@ func Gitmirror(args []string) int { return app.exitValue } +// TODO: rename appFromArgs? func parse(args []string) (*cfg, error) { op := optionparser.NewOptionParser() - cfg := &cfg{cmd: cmd} - op.On("-c", "--config", "Use this config file (default ~/.gitmirror.json)", &cfg.cfgFile) - op.On("-q", "--quiet", "Only print error messages", &cfg.quiet) + app := alternativeNewAppEnv(cmd) + op.On("-c", "--config", "Use this config file (default ~/.gitmirror.json)", &app.cfgFile) + op.On("-q", "--quiet", "Only print error messages", &app.quiet) op.On("--version", "Print version and exit", version) op.Command("clone", "Clone git repositories using `git clone --mirror`") op.Command("update", "Update git repositories using `git remote update`") @@ -71,9 +72,10 @@ func parse(args []string) (*cfg, error) { return nil, err } - cfg.subCmd = op.Extra[0] - if cfg.cfgFile == "" { - cfg.defaultCfgFile = true + app.subCmd = op.Extra[0] + // TODO: Fix this + if app.cfgFile == "" { + app.defaultCfgFile = true cfg.cfgFile = defaultCfgFile }