mirror of
https://codeberg.org/libreboot/lbmk.git
synced 2026-07-16 03:25:25 +02:00
general code cleanup on lbmk shell scripts
in update/blobs/download, i saw instances where appdir was being deleted with rm -r, but the more appropriate command would rm -Rf. this is now fixed. other than that, i've mostly just simplified a bunch of if statements and consolidated some duplicated logic (e.g. if/else block for dependencies in build_dependencies() of update/blobs/download one or two functions and/or variables have been renamed, for greater clarity in the code, also removed a few messages that were redundant used printf instead of echo, in a few places, also fixed up the indentation in a few places Signed-off-by: Leah Rowe <leah@libreboot.org>
This commit is contained in:
@@ -53,18 +53,15 @@ main()
|
||||
build_grub_payloads()
|
||||
{
|
||||
keylayoutfile=${1}
|
||||
[ -f "${keylayoutfile}" ] || continue
|
||||
|
||||
if [ ! -f "${keylayoutfile}" ]; then
|
||||
continue
|
||||
fi
|
||||
keymap="${keylayoutfile##${grubcfgsdir}/keymap/}"
|
||||
keymap="${keymap%.gkb}"
|
||||
|
||||
build_grub_elf "${keylayoutfile}"
|
||||
create_grub_config
|
||||
|
||||
printf "Created 'elf/grub/grub_%s.elf' and configs.'\n" \
|
||||
"${keymap}"
|
||||
printf "Created 'elf/grub/grub_%s.elf' and configs.'\n" "${keymap}"
|
||||
}
|
||||
|
||||
build_grub_elf()
|
||||
@@ -75,24 +72,22 @@ build_grub_elf()
|
||||
gcfg="${gcfg}/config/grub_memdisk.cfg"
|
||||
grubk="/boot/grub/layouts/${keymap}.gkb=${keylayoutfile}"
|
||||
grub/grub-mkstandalone \
|
||||
--grub-mkimage="grub/grub-mkimage" \
|
||||
-O i386-coreboot \
|
||||
-o elf/grub/grub_${keymap}.elf \
|
||||
-d grub/grub-core/ \
|
||||
--fonts= --themes= --locales= \
|
||||
--modules="${grub_modules}" \
|
||||
--install-modules="${grub_install_modules}" \
|
||||
${gcfg} ${grubk}
|
||||
--grub-mkimage="grub/grub-mkimage" \
|
||||
-O i386-coreboot \
|
||||
-o elf/grub/grub_${keymap}.elf \
|
||||
-d grub/grub-core/ \
|
||||
--fonts= --themes= --locales= \
|
||||
--modules="${grub_modules}" \
|
||||
--install-modules="${grub_install_modules}" \
|
||||
${gcfg} ${grubk}
|
||||
}
|
||||
|
||||
create_grub_config()
|
||||
{
|
||||
sed "s/usqwerty/${keymap}/" \
|
||||
< ${grubcfgsdir}/config/grub.cfg \
|
||||
> elf/grub/grub_${keymap}.cfg
|
||||
sed "s/grubtest.cfg/grub.cfg/" \
|
||||
< elf/grub/grub_${keymap}.cfg \
|
||||
> elf/grub/grub_${keymap}_test.cfg
|
||||
sed "s/usqwerty/${keymap}/" < ${grubcfgsdir}/config/grub.cfg \
|
||||
> elf/grub/grub_${keymap}.cfg
|
||||
sed "s/grubtest.cfg/grub.cfg/" < elf/grub/grub_${keymap}.cfg \
|
||||
> elf/grub/grub_${keymap}_test.cfg
|
||||
}
|
||||
|
||||
main $@
|
||||
|
||||
Reference in New Issue
Block a user