fixup! Fix hang when returning from shell command

stefanhaller · stefanhaller · commit f9c37d3245b3 · 2024-12-27T14:40:20.000+01:00
diff --git a/pkg/commands/oscommands/cmd_obj_builder.go b/pkg/commands/oscommands/cmd_obj_builder.go
@@ -52,7 +52,7 @@ func (self *CmdObjBuilder) NewShell(commandStr string) ICmdObj {
 }
 
 func (self *CmdObjBuilder) NewInteractiveShell(commandStr string) ICmdObj {
-	quotedCommand := self.quotedCommandString(commandStr) + self.platform.InteractiveShellExit
+	quotedCommand := self.quotedCommandString(commandStr + self.platform.InteractiveShellExit)
 	cmdArgs := str.ToArgv(fmt.Sprintf("%s %s %s %s", self.platform.InteractiveShell, self.platform.InteractiveShellArg, self.platform.ShellArg, quotedCommand))
 
 	return self.New(cmdArgs)

Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ func (self *CmdObjBuilder) NewShell(commandStr string) ICmdObj {`
`52`	`52`	`}`
`53`	`53`
`54`	`54`	`func (self *CmdObjBuilder) NewInteractiveShell(commandStr string) ICmdObj {`
`55`		`- quotedCommand := self.quotedCommandString(commandStr) + self.platform.InteractiveShellExit`
	`55`	`+ quotedCommand := self.quotedCommandString(commandStr + self.platform.InteractiveShellExit)`
`56`	`56`	`cmdArgs := str.ToArgv(fmt.Sprintf("%s %s %s %s", self.platform.InteractiveShell, self.platform.InteractiveShellArg, self.platform.ShellArg, quotedCommand))`
`57`	`57`
`58`	`58`	`return self.New(cmdArgs)`