From 312062959af3388c642f6764137aa695c3737f78 Mon Sep 17 00:00:00 2001
From: Dieter Plaetinck <dieter@plaetinck.be>
Date: Sun, 12 Dec 2010 20:49:03 +0100
Subject: make font/keymap selection dialogs more robust

---
 src/core/libs/lib-ui.sh | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'src/core/libs/lib-ui.sh')

diff --git a/src/core/libs/lib-ui.sh b/src/core/libs/lib-ui.sh
index 60d4c49..db6a4a9 100644
--- a/src/core/libs/lib-ui.sh
+++ b/src/core/libs/lib-ui.sh
@@ -60,11 +60,11 @@ set_keymap ()
 {
 	KBDDIR="/usr/share/kbd"
 
-	KEYMAPS=
+	KEYMAPS=()
 	for i in $(find $KBDDIR/keymaps -name "*.gz" | sort); do
-		KEYMAPS="$KEYMAPS ${i##$KBDDIR/keymaps/} -"
+		KEYMAPS+=("${i##$KBDDIR/keymaps/}" -)
 	done
-	ask_option "${var_KEYMAP:-no}" "Select A Keymap" '' optional $KEYMAPS
+	ask_option "${var_KEYMAP:-no}" "Select a keymap" '' optional "${KEYMAPS[@]}"
 	if [ -n "$ANSWER_OPTION" ]
 	then
 		loadkeys -q $KBDDIR/keymaps/$ANSWER_OPTION
@@ -72,11 +72,11 @@ set_keymap ()
 		echo "$var_KEYMAP" > $RUNTIME_DIR/aif-keymap
 	fi
 
-	FONTS=
+	FONTS=()
 	for i in $(find $KBDDIR/consolefonts -maxdepth 1 -name "*.gz"  | sed 's|^.*/||g' | sort); do
-		FONTS="$FONTS $i -"
+		FONTS+=("$i" -)
 	done
-	ask_option "${var_CONSOLEFONT:-no}" "Select A Console Font" '' optional $FONTS
+	ask_option "${var_CONSOLEFONT:-no}" "Select a console font" '' optional "${FONTS[@]}"
 	if [ -n "$ANSWER_OPTION" ]
 	then
 		var_CONSOLEFONT=$ANSWER_OPTION
-- 
cgit v1.2.3-54-g00ecf