fix cli "Before" handling

wxiaoguang · wxiaoguang · commit 92f912fffcb7 · 2025-10-31T07:12:37.000+08:00
diff --git a/cmd/main.go b/cmd/main.go
@@ -50,11 +50,15 @@ DEFAULT CONFIGURATION:
 
 func prepareSubcommandWithGlobalFlags(originCmd *cli.Command) {
 	originBefore := originCmd.Before
-	originCmd.Before = func(ctx context.Context, cmd *cli.Command) (context.Context, error) {
-		prepareWorkPathAndCustomConf(cmd)
+	originCmd.Before = func(ctxOrig context.Context, cmd *cli.Command) (ctx context.Context, err error) {
+		ctx = ctxOrig
 		if originBefore != nil {
-			return originBefore(ctx, cmd)
+			ctx, err = originBefore(ctx, cmd)
+			if err != nil {
+				return ctx, err
+			}
 		}
+		prepareWorkPathAndCustomConf(cmd)
 		return ctx, nil
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -50,11 +50,15 @@ DEFAULT CONFIGURATION:`
`50`	`50`
`51`	`51`	`func prepareSubcommandWithGlobalFlags(originCmd *cli.Command) {`
`52`	`52`	`originBefore := originCmd.Before`
`53`		`- originCmd.Before = func(ctx context.Context, cmd *cli.Command) (context.Context, error) {`
`54`		`- prepareWorkPathAndCustomConf(cmd)`
	`53`	`+ originCmd.Before = func(ctxOrig context.Context, cmd *cli.Command) (ctx context.Context, err error) {`
	`54`	`+ ctx = ctxOrig`
`55`	`55`	`if originBefore != nil {`
`56`		`- return originBefore(ctx, cmd)`
	`56`	`+ ctx, err = originBefore(ctx, cmd)`
	`57`	`+ if err != nil {`
	`58`	`+ return ctx, err`
	`59`	`+ }`
`57`	`60`	`}`
	`61`	`+ prepareWorkPathAndCustomConf(cmd)`
`58`	`62`	`return ctx, nil`
`59`	`63`	`}`
`60`	`64`	`}`