From 4674ee4f23b0abb03250e3055b2dcbbc4e2d82eb Mon Sep 17 00:00:00 2001 From: Francis Rowe Date: Sun, 30 Aug 2015 11:17:54 -0400 Subject: grub-assemble gen.sh: only run list_keymaps once --- (limited to 'resources/utilities') diff --git a/resources/utilities/grub-assemble/gen.sh b/resources/utilities/grub-assemble/gen.sh index 7b836a6..9dc6d21 100755 --- a/resources/utilities/grub-assemble/gen.sh +++ b/resources/utilities/grub-assemble/gen.sh @@ -30,6 +30,7 @@ list_keymaps () { printf "/boot/grub/layouts/%s.gkb=keymap/%s.gkb " "${keymap}" "${keymap}" done } +keymaps=$(list_keymaps) printf "Creating GRUB ELF executable for configuration '%s'\n" "${1}" if [ "${1}" = "vesafb" ] @@ -45,7 +46,7 @@ then --install-modules="${grub_install_modules}" \ /boot/grub/grub.cfg="../../../resources/grub/config/grub_memdisk.cfg" \ /dejavusansmono.pf2="../../../resources/grub/font/dejavusansmono.pf2" \ - $(list_keymaps) + "${keymaps}" elif [ "${1}" = "txtmode" ] then # Generate the grub.elf (txtmode) @@ -59,7 +60,7 @@ then --install-modules="${grub_install_modules}" \ /boot/grub/grub.cfg="../../../resources/grub/config/grub_memdisk.cfg" \ /memtest="../../../memtest86plus/memtest" \ - $(list_keymaps) + "${keymaps}" else printf "grub-assemble gen.sh: invalid mode '%s'\n" "${1}" exit 1 -- cgit v0.9.1