From 2b5fbcbeb8a9efc7e754ebc85320cf5075b5f991 Mon Sep 17 00:00:00 2001
From: P. J. McDermott <pj@pehjota.net>
Date: Wed, 28 Oct 2015 15:13:11 -0400
Subject: dist_get_rom(): Sort keymaps

---
diff --git a/src/dist/libiquity.sh b/src/dist/libiquity.sh
index e6acd46..ca9b39e 100644
--- a/src/dist/libiquity.sh
+++ b/src/dist/libiquity.sh
@@ -118,7 +118,7 @@ dist_libiquity_get_rom_taurinus_201506()
 	done <<-EOF
 		$(unxz -c "${archive}" | tar -t)
 		EOF
-	i=$(show_menu 'Select keymap' ${keymaps})
+	i=$(show_menu 'Select keymap' $(printf '%s\n' ${keymaps} | sort))
 	i=$(($i + 1))
 	rom="$(printf '%s ' ${keymaps} | cut -d ' ' -f ${i})"
 	rom="${dir}/${board}_${rom}_vesafb.rom"
@@ -189,7 +189,7 @@ dist_libiquity_get_rom_current()
 	done <<-EOF
 		$(unxz -c "${archive}" | tar -t)
 		EOF
-	i=$(show_menu 'Select keymap' ${keymaps})
+	i=$(show_menu 'Select keymap' $(printf '%s\n' ${keymaps} | sort))
 	i=$(($i + 1))
 	rom="$(printf '%s ' ${keymaps} | cut -d ' ' -f ${i})"
 	rom="${dir}/${board}_${rom}_vesafb.rom"
diff --git a/src/dist/libreboot.sh b/src/dist/libreboot.sh
index 5ddcb8a..4d77075 100644
--- a/src/dist/libreboot.sh
+++ b/src/dist/libreboot.sh
@@ -132,7 +132,7 @@ dist_libreboot_get_rom_20150518()
 	done <<-EOF
 		$(unxz -c "${archive}" | tar -t)
 		EOF
-	i=$(show_menu 'Select keymap' ${keymaps})
+	i=$(show_menu 'Select keymap' $(printf '%s\n' ${keymaps} | sort))
 	i=$(($i + 1))
 	rom="$(printf '%s ' ${keymaps} | cut -d ' ' -f ${i})"
 	rom="${dir}/${board}_${rom}_vesafb.rom"
@@ -203,7 +203,7 @@ dist_libreboot_get_rom_current()
 	done <<-EOF
 		$(unxz -c "${archive}" | tar -t)
 		EOF
-	i=$(show_menu 'Select keymap' ${keymaps})
+	i=$(show_menu 'Select keymap' $(printf '%s\n' ${keymaps} | sort))
 	i=$(($i + 1))
 	rom="$(printf '%s ' ${keymaps} | cut -d ' ' -f ${i})"
 	rom="${dir}/${board}_${rom}_vesafb.rom"
--
cgit v0.9.1