From edb8fd65d87d379212c46fd8de4c3aee49432411 Mon Sep 17 00:00:00 2001
From: Mike Landau <mikeland86@gmail.com>
Date: Tue, 17 Oct 2023 11:49:29 -0700
Subject: [PATCH] [sed] Fix bin wrappers when sed is installed with devbox

---
 internal/wrapnix/wrapper.go      | 3 +++
 internal/wrapnix/wrapper.sh.tmpl | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/internal/wrapnix/wrapper.go b/internal/wrapnix/wrapper.go
index 8e9ec847958..1dec1b85860 100644
--- a/internal/wrapnix/wrapper.go
+++ b/internal/wrapnix/wrapper.go
@@ -48,6 +48,7 @@ func CreateWrappers(ctx context.Context, args CreateWrappersArgs) error {
 	_ = os.MkdirAll(destPath, 0o755)
 
 	bashPath := cmdutil.GetPathOrDefault("bash", "/bin/bash")
+	sedPath := cmdutil.GetPathOrDefault("sed", "sed")
 
 	if err := CreateDevboxSymlinkIfPossible(); err != nil {
 		return err
@@ -58,6 +59,7 @@ func CreateWrappers(ctx context.Context, args CreateWrappersArgs) error {
 			WrapperBinPath:     destPath,
 			CreateWrappersArgs: args,
 			BashPath:           bashPath,
+			SedPath:            sedPath,
 			Command:            bin,
 			DevboxSymlinkDir:   devboxSymlinkDir,
 			destPath:           filepath.Join(destPath, filepath.Base(bin)),
@@ -128,6 +130,7 @@ func CreateDevboxSymlinkIfPossible() error {
 type createWrapperArgs struct {
 	CreateWrappersArgs
 	BashPath         string
+	SedPath          string
 	Command          string
 	destPath         string
 	DevboxSymlinkDir string
diff --git a/internal/wrapnix/wrapper.sh.tmpl b/internal/wrapnix/wrapper.sh.tmpl
index edcadb6f09f..6e4764b326e 100644
--- a/internal/wrapnix/wrapper.sh.tmpl
+++ b/internal/wrapnix/wrapper.sh.tmpl
@@ -32,6 +32,6 @@ should be in PATH.
 This is implemented in sed for efficiency. sed is POSIX so we assume it's available.
 
 */ -}}
-export PATH=$(echo $PATH | sed -e 's#:{{ .WrapperBinPath }}##' -e 's#{{ .WrapperBinPath }}:##' -e 's#{{ .WrapperBinPath }}##')
+export PATH=$(echo $PATH | {{ .SedPath }} -e 's#:{{ .WrapperBinPath }}##' -e 's#{{ .WrapperBinPath }}:##' -e 's#{{ .WrapperBinPath }}##')
 
 exec {{ .Command }} "$@"