[bin wrappers] fixes for only-path-without-wrappers call

Author: savil

internal/impl/devbox.go

@@ -325,7 +325,9 @@ func (d *Devbox) PrintEnv(opts *devopt.PrintEnv) (string, error) {
 	if opts.OnlyPathWithoutWrappers {
 		path := []string{}
 		for _, p := range strings.Split(envs["PATH"], string(filepath.ListSeparator)) {
-			if !strings.Contains(p, plugin.WrapperPath) {
+			// Intentionally do not include projectDir with plugin.WrapperBinPath so that
+			// we filter out bin-wrappers for devbox-global and devbox-project.
+			if !strings.Contains(p, plugin.WrapperBinPath) {
 				path = append(path, p)
 			}
 		}

internal/wrapnix/wrapper.go

@@ -13,7 +13,6 @@ import (
 	"text/template"
 
 	"github.com/pkg/errors"
-
 	"go.jetpack.io/devbox/internal/cmdutil"
 	"go.jetpack.io/devbox/internal/nix"
 	"go.jetpack.io/devbox/internal/plugin"
@@ -48,7 +47,7 @@ func CreateWrappers(ctx context.Context, devbox devboxer) error {
 	_ = os.RemoveAll(filepath.Join(devbox.ProjectDir(), plugin.WrapperPath))
 
 	// Recreate the bin wrapper directory
-	destPath := filepath.Join(devbox.ProjectDir(), plugin.WrapperBinPath)
+	destPath := filepath.Join(GetWrapperBinPath(devbox))
 	_ = os.MkdirAll(destPath, 0755)
 
 	bashPath := cmdutil.GetPathOrDefault("bash", "/bin/bash")
@@ -91,13 +90,17 @@ func CreateWrappers(ctx context.Context, devbox devboxer) error {
 			return errors.WithStack(err)
 		}
 	}
-	if err = createDevboxSymlink(devbox.ProjectDir()); err != nil {
+	if err = createDevboxSymlink(devbox); err != nil {
 		return err
 	}
 
 	return createSymlinksForSupportDirs(devbox.ProjectDir())
 }
 
+func GetWrapperBinPath(devbox devboxer) string {
+	return filepath.Join(devbox.ProjectDir(), plugin.WrapperBinPath)
+}
+
 type createWrapperArgs struct {
 	devboxer
 	BashPath     string
@@ -168,15 +171,15 @@ func createSymlinksForSupportDirs(projectDir string) error {
 
 // Creates a symlink for devbox in .devbox/virtenv/.wrappers/bin
 // so that devbox can be available inside a pure shell
-func createDevboxSymlink(projectDir string) error {
+func createDevboxSymlink(devbox devboxer) error {
 
 	// Get absolute path for where devbox is called
 	devboxPath, err := filepath.Abs(os.Args[0])
 	if err != nil {
 		return errors.Wrap(err, "failed to create devbox symlink. Devbox command won't be available inside the shell")
 	}
 	// Create a symlink between devbox in .wrappers/bin
-	err = os.Symlink(devboxPath, filepath.Join(projectDir, plugin.WrapperBinPath, "devbox"))
+	err = os.Symlink(devboxPath, filepath.Join(GetWrapperBinPath(devbox), "devbox"))
 	if err != nil && !errors.Is(err, fs.ErrExist) {
 		return errors.Wrap(err, "failed to create devbox symlink. Devbox command won't be available inside the shell")
 	}

internal/wrapnix/wrapper.sh.tmpl

@@ -1,6 +1,6 @@
 #!{{ .BashPath }}
 
-{{/* 
+{{/*
 # If env variable has never been set by devbox we set it, but also
 # default to env value set by user. This means plugin env variables behave a bit
 # differently than devbox.json env variables which are always set once.
@@ -29,9 +29,13 @@ 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)"
+{{/*
+We call only-path-without-wrappers 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.
+
+DO_NOT_TRACK=1 can be removed once we optimize segment to queue events.
+*/ -}}
+eval "$(DO_NOT_TRACK=1 devbox shellenv only-path-without-wrappers -c {{ .ProjectDir }})"
 
 exec {{ .Command }} "$@"