remove moar pathStackInPlace

Author: savil

devbox.go

@@ -20,10 +20,10 @@ type Devbox interface {
 	Config() *devconfig.Config
 	EnvVars(ctx context.Context) ([]string, error)
 	Info(ctx context.Context, pkg string, markdown bool) (string, error)
-	Install(ctx context.Context, pathStackInPlace bool) error
+	Install(ctx context.Context) error
 	IsEnvEnabled() bool
 	ListScripts() []string
-	NixEnv(ctx context.Context, includeHooks, pathStackInPlace bool) (string, error)
+	NixEnv(ctx context.Context, includeHooks bool) (string, error)
 	PackageNames() []string
 	ProjectDir() string
 	Pull(ctx context.Context, opts devopt.PullboxOpts) error

internal/boxcli/install.go

@@ -39,7 +39,7 @@ func installCmdFunc(cmd *cobra.Command, flags runCmdFlags) error {
 	if err != nil {
 		return errors.WithStack(err)
 	}
-	if err = box.Install(cmd.Context(), false /*preservePathStack*/); err != nil {
+	if err = box.Install(cmd.Context()); err != nil {
 		return errors.WithStack(err)
 	}
 	fmt.Fprintln(cmd.ErrOrStderr(), "Finished installing packages.")

internal/boxcli/shell.go

@@ -66,7 +66,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.NixEnv(cmd.Context(), false /*includeHooks*/, false /*preservePathStack*/)
+		script, err := box.NixEnv(cmd.Context(), false /*includeHooks*/)
 		if err != nil {
 			return err
 		}

internal/boxcli/shellenv.go

@@ -80,12 +80,12 @@ func shellEnvFunc(cmd *cobra.Command, flags shellEnvCmdFlags) (string, error) {
 	}
 
 	if flags.install {
-		if err := box.Install(cmd.Context(), flags.preservePathStack); err != nil {
+		if err := box.Install(cmd.Context()); err != nil {
 			return "", err
 		}
 	}
 
-	envStr, err := box.NixEnv(cmd.Context(), flags.runInitHook, flags.preservePathStack)
+	envStr, err := box.NixEnv(cmd.Context(), flags.runInitHook)
 	if err != nil {
 		return "", err
 	}

internal/impl/devbox.go

@@ -264,11 +264,11 @@ func (d *Devbox) RunScript(ctx context.Context, cmdName string, cmdArgs []string
 // Install ensures that all the packages in the config are installed and
 // 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, pathStackInPlace bool) error {
+func (d *Devbox) Install(ctx context.Context) error {
 	ctx, task := trace.NewTask(ctx, "devboxInstall")
 	defer task.End()
 
-	if _, err := d.NixEnv(ctx, false /*includeHooks*/, pathStackInPlace); err != nil {
+	if _, err := d.NixEnv(ctx, false /*includeHooks*/); err != nil {
 		return err
 	}
 	return wrapnix.CreateWrappers(ctx, d)
@@ -285,7 +285,7 @@ func (d *Devbox) ListScripts() []string {
 	return keys
 }
 
-func (d *Devbox) NixEnv(ctx context.Context, includeHooks, pathStackInPlace bool) (string, error) {
+func (d *Devbox) NixEnv(ctx context.Context, includeHooks bool) (string, error) {
 	ctx, task := trace.NewTask(ctx, "devboxNixEnv")
 	defer task.End()