summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2017-05-19 14:39:35 +0200
committerNatanael Copa <ncopa@alpinelinux.org>2017-05-19 14:39:35 +0200
commitbe87a08bc2200b80c068347568bea07a4fa09fb7 (patch)
tree34581203ec1ae9ba78faf545dfb79cc0a074bd8c
parente90ed7241b90be6681d196de8f83afd23d157ed0 (diff)
downloadalpine-conf-be87a08bc2200b80c068347568bea07a4fa09fb7.zip
setup-keymap: allow specify the variant together with layout
Some users may know exactly which variant they want, and instead of asking them two questions, we accept if users types in the variant at the first question. if the variant does not exist, then user is prompted.
-rw-r--r--setup-keymap.in8
1 files changed, 7 insertions, 1 deletions
diff --git a/setup-keymap.in b/setup-keymap.in
index 67f89cb..ebcd29c 100644
--- a/setup-keymap.in
+++ b/setup-keymap.in
@@ -38,7 +38,13 @@ select_layout() {
default_read layout "$layout"
if [ "$layout" = "abort" ] || [ "$layout" = "none" ] ; then
goodbye 0
- elif [ -d "$MAPDIR/$layout" ] ; then
+ fi
+ set -- $layout
+ if [ $# -eq 2 ]; then
+ layout="$1"
+ variant="$2"
+ fi
+ if [ -d "$MAPDIR/$layout" ] ; then
return 0
fi
done