summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorP. J. McDermott <pj@pehjota.net>2015-10-28 15:13:11 (EDT)
committer P. J. McDermott <pj@pehjota.net>2015-10-28 15:13:11 (EDT)
commit2b5fbcbeb8a9efc7e754ebc85320cf5075b5f991 (patch)
tree42e54522dace9cb0f6bbfb0f39cb62cf95fd3d5e
parent2866cf64b485bde1ed1357d433ab0268a5ee7746 (diff)
downloadfirman.sh-2b5fbcbeb8a9efc7e754ebc85320cf5075b5f991.zip
firman.sh-2b5fbcbeb8a9efc7e754ebc85320cf5075b5f991.tar.gz
firman.sh-2b5fbcbeb8a9efc7e754ebc85320cf5075b5f991.tar.bz2
dist_get_rom(): Sort keymaps
-rw-r--r--src/dist/libiquity.sh4
-rw-r--r--src/dist/libreboot.sh4
2 files changed, 4 insertions, 4 deletions
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"