|
58 | 58 | container_command="" |
59 | 59 | # by default we use getent to get the login shell of the user and use that |
60 | 60 | container_command_login="/bin/sh -c \"\\\$(getent passwd ${USER} | cut -f 7 -d :) -l\"" |
61 | | -# and we execute container_command using sh -c |
62 | | -container_command_prefix="/bin/sh -c" |
63 | 61 | container_image_default="registry.fedoraproject.org/fedora-toolbox:39" |
64 | 62 | container_manager="autodetect" |
65 | 63 | container_manager_additional_flags="" |
@@ -214,7 +212,7 @@ while :; do |
214 | 212 | ;; |
215 | 213 | -e | --exec | --) |
216 | 214 | shift |
217 | | - container_command="$1" |
| 215 | + container_command="\"$1\"" |
218 | 216 | shift |
219 | 217 | for arg in "$@"; do |
220 | 218 | arg="$(echo "${arg}x" | sed 's|'\''|'\'\\\\\'\''|g')" |
@@ -335,7 +333,6 @@ generate_command() { |
335 | 333 | container_command_login="${container_command_login} --pty" |
336 | 334 | fi |
337 | 335 | container_command_login="${container_command_login} -c \"\\\$(getent passwd ${USER} | cut -f 7 -d :) -l\"" |
338 | | - container_command_prefix="${container_command_login} -c" |
339 | 336 | else |
340 | 337 | result_command="${result_command} |
341 | 338 | --user=\"${USER}"\" |
@@ -468,8 +465,7 @@ generate_command() { |
468 | 465 | ${container_name}" |
469 | 466 |
|
470 | 467 | if [ -n "${container_command}" ]; then |
471 | | - result_command="${result_command} |
472 | | - ${container_command_prefix} \"${container_command}\"" |
| 468 | + result_command="${result_command} ${container_command}" |
473 | 469 | else |
474 | 470 | # if no command was specified, let's execute a command that will find |
475 | 471 | # and run the default shell for the user |
|
0 commit comments