Skip to content

Commit

Permalink
feat: change exit_cli method for use clear
Browse files Browse the repository at this point in the history
  • Loading branch information
sinlov committed Jul 17, 2023
1 parent 71b05be commit b94ec05
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
12 changes: 6 additions & 6 deletions command/exit_cli/exit.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,26 +13,26 @@ func ChangeDefaultExitCode(code int) {
exitCode = code
}

func ExitCodeF(format string, a ...any) cli.ExitCoder {
func Format(format string, a ...any) cli.ExitCoder {
return cli.Exit(fmt.Sprintf(format, a...), exitCode)
}

func ExitF(code int, format string, a ...any) cli.ExitCoder {
func FormatCode(code int, format string, a ...any) cli.ExitCoder {
return cli.Exit(fmt.Sprintf(format, a...), code)
}

func ExitCodeErr(err error) cli.ExitCoder {
func Err(err error) cli.ExitCoder {
return cli.Exit(err.Error(), exitCode)
}

func ExitErr(code int, err error) cli.ExitCoder {
func ErrCode(code int, err error) cli.ExitCoder {
return cli.Exit(err.Error(), code)
}

func ExitCodeErrF(err error, msg string) cli.ExitCoder {
func ErrMsg(err error, msg string) cli.ExitCoder {
return cli.Exit(fmt.Sprintf("%s err: %s", msg, err), exitCode)
}

func ExitErrF(code int, err error, msg string) cli.ExitCoder {
func ErrMsgCode(code int, err error, msg string) cli.ExitCoder {
return cli.Exit(fmt.Sprintf("%s err: %s", msg, err), code)
}
4 changes: 2 additions & 2 deletions command/global.go
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ func GlobalBeforeAction(c *cli.Context) error {
appName := pkgJson.GetPackageJsonName()
cmdGlobalEntry, err = withGlobalFlag(c, cliVersion, appName)
if err != nil {
return exit_cli.ExitCodeErr(err)
return exit_cli.Err(err)
}

return nil
Expand All @@ -97,7 +97,7 @@ func GlobalAction(c *cli.Context) error {

err := cmdGlobalEntry.globalExec()
if err != nil {
return exit_cli.ExitCodeF("run GlobalAction err: %v", err)
return exit_cli.Format("run GlobalAction err: %v", err)
}
return nil
}
Expand Down

0 comments on commit b94ec05

Please sign in to comment.