setup-keymap: add option for variant from command-line

1 files changed, 16 insertions, 8 deletions

diff --git a/setup-keymap.in b/setup-keymap.in
index 770af50..e3aefaa 100644..100755
--- a/setup-keymap.in
+++ b/setup-keymap.in
@@ -78,14 +78,14 @@ goodbye() {
 	exit $1
 }
 
-apk_info -e bkeymaps
+apk_info -eq bkeymaps
 was_installed=$?
 
 pkg_inst bkeymaps
 
 deflayout="$1"
+defvariant="$2"
 while true; do
-
 	if [ -n "$deflayout" ]; then
 		layout="$deflayout"
 		unset deflayout
@@ -93,12 +93,20 @@ while true; do
 		select_layout
 	fi
 
-	# if there is only one variant, just pick it
-	count=$(ls $MAPDIR/$layout | wc -l)
-	if [ $count -eq 1 ]; then
-		setup_mapfile "$MAPDIR/$layout/$(ls $MAPDIR/$layout)"
-		continue
+	if [ -n "$defvariant" ]; then
+		variant="$defvariant"
 	fi
 
-	select_variant
+	# if variant is defined, this could match, otherwise we'll have to choose a variant
+	if [ -f "$MAPDIR/$layout/$variant.bmap" ]; then
+		setup_mapfile "$MAPDIR/$layout/$variant.bmap"
+	else
+		# if there is only one variant, just pick it
+		count=$(ls $MAPDIR/$layout | wc -l)
+		if [ $count -eq 1 ]; then
+			setup_mapfile "$MAPDIR/$layout/$(ls $MAPDIR/$layout)"
+			continue
+		fi
+		select_variant
+	fi
 done