Skip to content
Snippets Groups Projects
Commit 0df703be authored by Simon McVittie's avatar Simon McVittie
Browse files

wrap-interactive: Fix display of pressure-vessel-wrap's name


Use its own name, and not the first word of the command we executed or
would have executed.

Signed-off-by: default avatarSimon McVittie <smcv@collabora.com>
parent df1d2fac
No related branches found
No related tags found
No related merge requests found
......@@ -54,7 +54,7 @@ pv_bwrap_wrap_interactive (FlatpakBwrap *wrapped_command,
"echo\n"
"echo\n"
"echo\n"
"echo \"$1: Starting interactive shell (original command is in "
"echo \"$prgname: Starting interactive shell (original command is in "
"\\\"\\$@\\\")\"\n"
"echo\n"
"echo\n"
......@@ -86,7 +86,7 @@ pv_bwrap_wrap_interactive (FlatpakBwrap *wrapped_command,
case PV_SHELL_FAIL:
script =
"if \"$@\"; then exit 0; else e=\"$?\"; fi\n"
"echo \"$1: command exit status $e\"\n";
"echo \"$prgname: command exit status $e\"\n";
break;
case PV_SHELL_INSTEAD:
......@@ -105,9 +105,9 @@ pv_bwrap_wrap_interactive (FlatpakBwrap *wrapped_command,
"sh", "-euc",
command,
"sh", /* $0 for sh */
g_get_prgname (), /* $1 for sh */
g_get_prgname (), /* $1 = $prgname for sh */
/* Original command will go here and become
* the argv of command, and eventually
* the rest of the argv of command, and eventually
* the argv of bash -i -s */
NULL);
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment