wrappers] ensure bin-wrappers invoke other binaries and not bin-wrappers

devbox.go

@@ -33,7 +33,7 @@ type Devbox interface {
 	Install(ctx context.Context) error
 	IsEnvEnabled() bool
 	ListScripts() []string
-	PrintEnv(ctx context.Context, includeHooks bool) (string, error)
+	PrintEnv(opts *devopt.PrintEnv) (string, error)
 	PrintGlobalList() error
 	Pull(ctx context.Context, overwrite bool, path string) error
 	Push(url string) error

examples/stacks/lapp-stack/devbox.json

@@ -31,4 +31,4 @@
       ]
     }
   }
-}
+}

internal/boxcli/shell.go

@@ -59,7 +59,7 @@ func runShellCmd(cmd *cobra.Command, flags shellCmdFlags) error {
 	if flags.printEnv {
 		// false for includeHooks is because init hooks is not compatible with .envrc files generated
 		// by versions older than 0.4.6
-		script, err := box.PrintEnv(cmd.Context(), false /*includeHooks*/)
+		script, err := box.PrintEnv(&devopt.PrintEnv{Ctx: cmd.Context()})
 		if err != nil {
 			return err
 		}

internal/boxcli/shellenv.go

@@ -55,6 +55,9 @@ func shellEnvCmd() *cobra.Command {
 	// This is used by bin wrappers and not meant for end users.
 	command.Flag("use-cached-print-dev-env").Hidden = true
 	flags.config.register(command)
+
+	command.AddCommand(shellEnvOnlyPathWithoutWrappersCmd())
+
 	return command
 }
 
@@ -74,7 +77,60 @@ func shellEnvFunc(cmd *cobra.Command, flags shellEnvCmdFlags) (string, error) {
 		}
 	}
 
-	envStr, err := box.PrintEnv(cmd.Context(), flags.runInitHook)
+	opts := &devopt.PrintEnv{
+		Ctx:          cmd.Context(),
+		IncludeHooks: flags.runInitHook,
+	}
+	envStr, err := box.PrintEnv(opts)
+	if err != nil {
+		return "", err
+	}
+
+	return envStr, nil
+}
+
+type shellEnvOnlyPathWithoutWrappersCmdFlags struct {
+	config configFlags
+}
+
+func shellEnvOnlyPathWithoutWrappersCmd() *cobra.Command {
+	flags := shellEnvOnlyPathWithoutWrappersCmdFlags{}
+	command := &cobra.Command{
+		Use:     "only-path-without-wrappers",
+		Hidden:  true,
+		Short:   "Print shell commands that export PATH without the bin-wrappers",
+		Args:    cobra.ExactArgs(0),
+		PreRunE: ensureNixInstalled,
+		RunE: func(cmd *cobra.Command, args []string) error {
+			s, err := shellEnvOnlyPathWithoutWrappersFunc(cmd, &flags)
+			if err != nil {
+				return err
+			}
+			fmt.Fprintln(cmd.OutOrStdout(), s)
+			fmt.Fprintln(cmd.OutOrStdout(), "hash -r")
+			return nil
+		},
+	}
+	flags.config.register(command)
+	return command
+}
+
+func shellEnvOnlyPathWithoutWrappersFunc(cmd *cobra.Command, flags *shellEnvOnlyPathWithoutWrappersCmdFlags) (string, error) {
+
+	box, err := devbox.Open(&devopt.Opts{
+		Dir:    flags.config.path,
+		Writer: cmd.ErrOrStderr(),
+		Pure:   false,
+	})
+	if err != nil {
+		return "", err
+	}
+
+	opts := &devopt.PrintEnv{
+		Ctx:                     cmd.Context(),
+		OnlyPathWithoutWrappers: true,
+	}
+	envStr, err := box.PrintEnv(opts)
 	if err != nil {
 		return "", err
 	}

internal/impl/devbox.go

@@ -293,7 +293,7 @@ func (d *Devbox) RunScript(ctx context.Context, cmdName string, cmdArgs []string
 // creates all wrappers, but does not run init hooks. It is used to power
 // devbox install cli command.
 func (d *Devbox) Install(ctx context.Context) error {
-	if _, err := d.PrintEnv(ctx, false /* run init hooks */); err != nil {
+	if _, err := d.PrintEnv(&devopt.PrintEnv{Ctx: ctx}); err != nil {
 		return err
 	}
 	return wrapnix.CreateWrappers(ctx, d)
@@ -309,8 +309,8 @@ func (d *Devbox) ListScripts() []string {
 	return keys
 }
 
-func (d *Devbox) PrintEnv(ctx context.Context, includeHooks bool) (string, error) {
-	ctx, task := trace.NewTask(ctx, "devboxPrintEnv")
+func (d *Devbox) PrintEnv(opts *devopt.PrintEnv) (string, error) {
+	ctx, task := trace.NewTask(opts.Ctx, "devboxPrintEnv")
 	defer task.End()
 
 	if err := d.ensurePackagesAreInstalled(ctx, ensure); err != nil {
@@ -322,9 +322,23 @@ func (d *Devbox) PrintEnv(ctx context.Context, includeHooks bool) (string, error
 		return "", err
 	}
 
+	if opts.OnlyPathWithoutWrappers {
+		path := []string{}
+		for _, p := range strings.Split(envs["PATH"], string(filepath.ListSeparator)) {
+			if !strings.Contains(p, plugin.WrapperPath) {
+				path = append(path, p)
+			}
+		}
+
+		// reset envs to be PATH only!
+		envs = map[string]string{
+			"PATH": strings.Join(path, string(filepath.ListSeparator)),
+		}
+	}
+
 	envStr := exportify(envs)
 
-	if includeHooks {
+	if opts.IncludeHooks {
 		hooksStr := ". " + d.scriptPath(hooksFilename)
 		envStr = fmt.Sprintf("%s\n%s;\n", envStr, hooksStr)
 	}

internal/impl/devopt/devboxopts.go

@@ -1,10 +1,19 @@
 package devopt
 
-import "io"
+import (
+	"context"
+	"io"
+)
 
 type Opts struct {
 	Dir            string
 	Pure           bool
 	IgnoreWarnings bool
 	Writer         io.Writer
 }
+
+type PrintEnv struct {
+	Ctx                     context.Context
+	IncludeHooks            bool
+	OnlyPathWithoutWrappers bool
+}

internal/wrapnix/wrapper.sh.tmpl

@@ -29,4 +29,9 @@ export {{ .ShellEnvHashKey }}_GUARD=true
 eval "$(DO_NOT_TRACK=1 devbox shellenv -c {{ .ProjectDir }})"
 fi
 
+# So that we do not invoke other bin-wrappers from
+# this bin-wrapper. Instead, we directly invoke the binary from the nix store, which
+# should be in PATH.
+eval "$(devbox shellenv only-path-without-wrappers)"
+
 exec {{ .Command }} "$@"