From 1c0c88c7cb416310263fbfda7ee6e5a89142f6e4 Mon Sep 17 00:00:00 2001 From: Leah Rowe Date: Mon, 5 May 2025 17:53:02 +0100 Subject: [PATCH] rom.sh: specifically check keymaps in cprom() "not seauboot" is a valid check at present, but if i start supporting other arguments in the future, this code would have to change. therefore, i change it in advance, on that theory. this new check is more technically correct. these lines are triggered when inserting grub keymaps. Signed-off-by: Leah Rowe --- include/rom.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/rom.sh b/include/rom.sh index 50cc459..21c583e 100644 --- a/include/rom.sh +++ b/include/rom.sh @@ -241,11 +241,11 @@ cprom() { tmpnew=""; newrom="bin/$target/${pname}_${target}_$initmode.rom" [ -n "$displaymode" ] && newrom="${newrom%.rom}_$displaymode.rom" - [ $# -gt 0 ] && [ "$1" != "seauboot" ] && tmpnew="${1##*/}" && \ + [ $# -gt 0 ] && [ "${1%.gkb}" != "$1" ] && tmpnew="${1##*/}" && \ newrom="${newrom%.rom}_${tmpnew%.gkb}.rom" x_ mkdir -p "bin/$target" - x_ cp "$tmprom" "$newrom" && [ $# -gt 0 ] && [ "$1" != "seauboot" ] \ + x_ cp "$tmprom" "$newrom" && [ $# -gt 0 ] && [ "${1%.gkb}" != "$1" ] \ && cbfs "$newrom" "$grubdata/keymap/$tmpnew" keymap.gkb raw [ $# -gt 0 ] && [ "$1" = "seauboot" ] && \ cbfs "$newrom" "$grubdata/bootorder_uboot" bootorder raw; :