get timezone and keymap from user

needed because this installer does not run on a live iso

1 files changed, 13 insertions, 6 deletions

diff --git a/mkarmtix b/mkarmtix
index 540db49..de8b229 100755
--- a/mkarmtix
+++ b/mkarmtix
@@ -2,13 +2,20 @@
 
 set -e
 
-function get_cmdline {
-	sed -r 's/[[:alnum:]]+=/\n&/g' /proc/cmdline | awk -F= "\$1==\"$1\"{print \$2}" | sed 's/.\{1\}$//'
-}
+#
+# Config questions
+#
+
+TIMEZONE=$1
+KEYMAP=$2
+
+if [ -z "${TIMEZONE}" ]; then
+	TIMEZONE=$(find /usr/share/zoneinfo | fzf)
+fi
 
-# cmdline options
-TIMEZONE=$(get_cmdline tz)
-KEYMAP=$(get_cmdline keytable)
+if [ -z "${KEYMAP}" ]; then
+	KEYMAP=$(echo "Enter keymap (e.g. us, de): " | fzf --disabled --print-query | sed -n '1 p')
+fi
 
 pacman -Syu --noconfirm