diff options
| -rw-r--r-- | argvAutoshell.go | 7 | ||||
| -rw-r--r-- | doSmart.go | 46 |
2 files changed, 18 insertions, 35 deletions
diff --git a/argvAutoshell.go b/argvAutoshell.go index 3f712a1..4943203 100644 --- a/argvAutoshell.go +++ b/argvAutoshell.go @@ -28,7 +28,7 @@ func (args) doBashAuto() { default: if argv.BashAuto[0] == ARGNAME { // list the subcommands here - fmt.Println("--bash strict --force") + fmt.Println("--smart strict") } } os.Exit(0) @@ -45,12 +45,9 @@ func (args) doBashHelp() { return } if argv.BashAuto[0] == ARGNAME { - pp.WriteHelp(os.Stderr) + // pp.WriteHelp(os.Stderr) return } - fmt.Fprintln(os.Stderr, "") - fmt.Fprintln(os.Stderr, "hello world") - fmt.Fprintln(os.Stderr, "") } // complete -F forge --bash forge @@ -8,9 +8,6 @@ import ( // this will make go.mod and go.sum files, but you have to // have the files in .gitignore for now func doSmart(repo *gitpb.Repo) error { - // erase the go.mod and go.sum files - eraseGoMod(repo) - // if the repo has go.mod in the repo... if err := repo.RepoIgnoresGoMod(); err != nil { if repo.ParseGoSum() { @@ -19,51 +16,40 @@ func doSmart(repo *gitpb.Repo) error { log.Info("go-mod-clean can not run on this repo", repo.GetGoPath()) log.Info("go.mod and go.sum must be git metadata to continue") // return nil + if repo.Exists("go.sum") { + return nil + } } - if repo.Exists("go.mod") { - return nil - } + // erase the go.mod and go.sum files + eraseGoMod(repo) // try to restore from the git metadata cname := repo.GetCurrentBranchName() if err := repo.AutogenRestore(cname); err == nil { log.Info(repo.GetGoPath(), "files were restored ok from git metadata (notes)") - } - if repo.Exists("go.mod") { - return nil - } - - // attempt to restore from ~/go/pkg/mod/ - if err := restoreFromGoPkg(repo); err == nil { - log.Info(repo.GetGoPath(), "files were restored ok ~/go/mod/") - } - if repo.Exists("go.mod") { - return nil + if repo.Exists("go.mod") { + return nil + } + // autogen restore didn't find go.mod } // actually will re-create go.sum and go.mod now if err := redoGoMod(repo); err != nil { - log.Info(repo.GetGoPath(), "the files were restored with redoGoMod()") + return err } + log.Info(repo.GetGoPath(), "the files were restored with redoGoMod()") if repo.Exists("go.mod") { return nil } // the first time, it'll attempt to fix some stuff - cleanGoDepsCheckOk(repo) - // try to trim junk - if err := trimGoSum(repo); err != nil { + if err := cleanGoDepsCheckOk(repo); err != nil { + return err } - if repo.Exists("go.mod") { - return nil - } - repo.ParseGoSum() - if repo.Exists("go.mod") { - return nil + // trim junk that might have been added by cleanGoDepsCheckOk() + if err := trimGoSum(repo); err != nil { + return err } - // last chance. just run go mod init - repo.RunVerbose([]string{"go", "mod", "init"}) - return nil } |