only set term if rsh is running /bin/sh

also set it without using env so it will work in containers
that don't have /bin/env

Author: bparees

pkg/cmd/cli/cmd/rsh.go

@@ -155,8 +155,9 @@ func (o *RshOptions) Validate() error {
 // Run starts a remote shell session on the server
 func (o *RshOptions) Run() error {
 	// Insert the TERM into the command to be run
-	term := fmt.Sprintf("TERM=%s", util.Env("TERM", "xterm"))
-	o.Command = append([]string{"env", term}, o.Command...)
-
+	if len(o.Command) == 1 && o.Command[0] == o.Executable {
+		termsh := fmt.Sprintf("TERM=%q %s", util.Env("TERM", "xterm"), o.Executable)
+		o.Command = append(o.Command, "-c", termsh)
+	}
 	return o.ExecOptions.Run()
 }