[shellenv] add --recompute flag with default=true, while keep global shellenv's recompute flag with default=false

Author: savil

internal/boxcli/global.go

@@ -14,12 +14,7 @@ import (
 	"go.jetpack.io/devbox/internal/ux"
 )
 
-type globalShellEnvCmdFlags struct {
-	recompute bool
-}
-
 func globalCmd() *cobra.Command {
-	globalShellEnvCmdFlags := globalShellEnvCmdFlags{}
 	globalCmd := &cobra.Command{}
 	persistentPreRunE := setGlobalConfigForDelegatedCommands(globalCmd)
 	*globalCmd = cobra.Command{
@@ -33,11 +28,13 @@ func globalCmd() *cobra.Command {
 		PersistentPostRunE: ensureGlobalEnvEnabled,
 	}
 
-	shellEnv := shellEnvCmd(&globalShellEnvCmdFlags.recompute)
-	shellEnv.Flags().BoolVarP(
-		&globalShellEnvCmdFlags.recompute, "recompute", "r", false,
-		"Recompute environment if needed",
-	)
+	shellEnv := shellEnvCmd()
+	// For `devbox shellenv` the default value of recompute is true.
+	// Change the default value to false for `devbox global shellenv` only.
+	shellEnv.Flag("recompute").DefValue = "false"
+	if err := shellEnv.Flag("recompute").Value.Set("false"); err != nil {
+		panic(errors.WithStack(err))
+	}
 
 	addCommandAndHideConfigFlag(globalCmd, addCmd())
 	addCommandAndHideConfigFlag(globalCmd, installCmd())

internal/boxcli/root.go

@@ -11,7 +11,6 @@ import (
 	"strings"
 	"time"
 
-	"github.com/samber/lo"
 	"github.com/spf13/cobra"
 
 	"go.jetpack.io/devbox/internal/boxcli/featureflag"
@@ -78,7 +77,7 @@ func RootCmd() *cobra.Command {
 	command.AddCommand(setupCmd())
 	command.AddCommand(shellCmd())
 	// True to always recompute environment if needed.
-	command.AddCommand(shellEnvCmd(lo.ToPtr(true)))
+	command.AddCommand(shellEnvCmd())
 	command.AddCommand(updateCmd())
 	command.AddCommand(versionCmd())
 	// Preview commands

internal/boxcli/shellenv.go

@@ -20,18 +20,19 @@ type shellEnvCmdFlags struct {
 	noRefreshAlias    bool
 	preservePathStack bool
 	pure              bool
+	recompute         bool
 	runInitHook       bool
 }
 
-func shellEnvCmd(recomputeEnvIfNeeded *bool) *cobra.Command {
+func shellEnvCmd() *cobra.Command {
 	flags := shellEnvCmdFlags{}
 	command := &cobra.Command{
 		Use:     "shellenv",
 		Short:   "Print shell commands that add Devbox packages to your PATH",
 		Args:    cobra.ExactArgs(0),
 		PreRunE: ensureNixInstalled,
 		RunE: func(cmd *cobra.Command, args []string) error {
-			s, err := shellEnvFunc(cmd, flags, *recomputeEnvIfNeeded)
+			s, err := shellEnvFunc(cmd, flags)
 			if err != nil {
 				return err
 			}
@@ -61,6 +62,12 @@ func shellEnvCmd(recomputeEnvIfNeeded *bool) *cobra.Command {
 			"Use this flag to disable this behavior.")
 	_ = command.Flags().MarkHidden("no-refresh-alias")
 
+	// Note, `devbox global shellenv` will override the default value to be false
+	command.Flags().BoolVarP(
+		&flags.recompute, "recompute", "r", true,
+		"Recompute environment if needed",
+	)
+
 	flags.config.register(command)
 	flags.envFlag.register(command)
 
@@ -70,7 +77,6 @@ func shellEnvCmd(recomputeEnvIfNeeded *bool) *cobra.Command {
 func shellEnvFunc(
 	cmd *cobra.Command,
 	flags shellEnvCmdFlags,
-	recomputeEnvIfNeeded bool,
 ) (string, error) {
 	env, err := flags.Env(flags.config.path)
 	if err != nil {
@@ -95,7 +101,7 @@ func shellEnvFunc(
 	}
 
 	envStr, err := box.EnvExports(cmd.Context(), devopt.EnvExportsOpts{
-		DontRecomputeEnvironment: !recomputeEnvIfNeeded,
+		DontRecomputeEnvironment: !flags.recompute,
 		NoRefreshAlias:           flags.noRefreshAlias,
 		RunHooks:                 flags.runInitHook,
 	})