From: Glenn Washburn Date: Tue, 10 Jan 2023 22:08:58 +0000 (-0600) Subject: tests/util/grub-shell: Trim line should always be matched from the beginning of the... X-Git-Tag: grub-2.12-rc1~156 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f38d1b4c75e32d80b6b4b0f3bdb058647af38bdf;p=thirdparty%2Fgrub.git tests/util/grub-shell: Trim line should always be matched from the beginning of the line When turning on shell tracing the trim line will be output before we actually want to start the trim. However, in this case the trim line never starts from the beginning of the line. So start trimming from the correct line by matching from the beginning of the line. Signed-off-by: Glenn Washburn Reviewed-by: Daniel Kiper --- diff --git a/tests/util/grub-shell.in b/tests/util/grub-shell.in index 8d5d2ce17..2acc9e0fc 100644 --- a/tests/util/grub-shell.in +++ b/tests/util/grub-shell.in @@ -357,7 +357,7 @@ terminal_output ${term} EOF if [ $trim = 1 ]; then - echo "echo $trim_head" >>${cfgfile} + echo "echo; echo $trim_head" >>${cfgfile} fi rom_directory="$work_directory/rom_directory" @@ -481,7 +481,7 @@ fi do_trim () { if [ $trim = 1 ] || [ $trim = 2 ]; then - awk '{ if (have_head == 1) print $0; } /'"$trim_head"'/ { have_head=1; }' + awk '{ if (have_head == 1) print $0; } /^'"$trim_head"'/ { have_head=1; }' else cat fi