add lots more locales

diff --git a/ask.sh b/ask.sh
index caf6797..57699fb 100755 (executable)
--- a/ask.sh
+++ b/ask.sh
@@ -51,8 +51,11 @@ while ! [ -e /root/instantARCH/config/confirm ]; do
 
     echo "$NEWKEY" >/root/instantARCH/config/keyboard
 
-    loadkeys $(tail -1 /root/instantARCH/data/lang/keyboard/"$NEWKEY")
-    guimode && setxkbmap -layout $(head -1 /root/instantARCH/data/lang/keyboard/"$NEWKEY")
+    if head -1 /root/instantARCH/data/lang/keyboard/"$NEWKEY" | greo -q ..; then
+        loadkeys $(head -1 /root/instantARCH/data/lang/keyboard/"$NEWKEY")
+    fi
+
+    guimode && setxkbmap -layout $(tail -1 /root/instantARCH/data/lang/keyboard/"$NEWKEY")
 
     cd ../locale
     while [ -z "$NEWLOCALE" ]; do
@@ -164,10 +167,13 @@ this will delete all existing data" | imenu -C; then
     addsum "Keyboard layout" "keyboard"
     addsum "Target install drive" "disk"
     addsum "Hostname" "hostname"
+
     if efibootmgr; then
-        addsum "GRUB" "UEFI"
+        SUMMARY="$SUMMARY
+GRUB: UEFI"
     else
-        addsum "GRUB" "BIOS"
+        SUMMARY="$SUMMARY
+GRUB: BIOS"
     fi
 
     SUMMARY="$SUMMARY

diff --git a/data/lang/keyboard/french b/data/lang/keyboard/french
new file mode 100644 (file)
index 0000000..21fa3e4
--- /dev/null
+++ b/data/lang/keyboard/french
@@ -0,0 +1,2 @@
+fr-latin1
+fr
\ No newline at end of file

diff --git a/data/lang/keyboard/polish b/data/lang/keyboard/polish
new file mode 100644 (file)
index 0000000..a901f67
--- /dev/null
+++ b/data/lang/keyboard/polish
@@ -0,0 +1,2 @@
+
+pl
\ No newline at end of file

diff --git a/data/lang/keyboard/russian b/data/lang/keyboard/russian
new file mode 100644 (file)
index 0000000..74d8efa
--- /dev/null
+++ b/data/lang/keyboard/russian
@@ -0,0 +1,2 @@
+
+ru
\ No newline at end of file

diff --git a/data/lang/keyboard/spanish b/data/lang/keyboard/spanish
new file mode 100644 (file)
index 0000000..ed5ba85
--- /dev/null
+++ b/data/lang/keyboard/spanish
@@ -0,0 +1,2 @@
+
+es
\ No newline at end of file

diff --git a/data/lang/keyboard/swedish b/data/lang/keyboard/swedish
new file mode 100644 (file)
index 0000000..094a1f4
--- /dev/null
+++ b/data/lang/keyboard/swedish
@@ -0,0 +1,2 @@
+
+sv
\ No newline at end of file

diff --git a/data/lang/keyboard/turkish b/data/lang/keyboard/turkish
new file mode 100644 (file)
index 0000000..9943681
--- /dev/null
+++ b/data/lang/keyboard/turkish
@@ -0,0 +1,2 @@
+
+tr
\ No newline at end of file

diff --git a/data/lang/locale/polish b/data/lang/locale/polish
new file mode 100644 (file)
index 0000000..9eff7dc
--- /dev/null
+++ b/data/lang/locale/polish
@@ -0,0 +1,2 @@
+en_US.UTF-8 UTF-8
+pl.UTF-8 UTF-8
\ No newline at end of file

diff --git a/data/lang/locale/russian b/data/lang/locale/russian
new file mode 100644 (file)
index 0000000..79f4dfd
--- /dev/null
+++ b/data/lang/locale/russian
@@ -0,0 +1,2 @@
+en_US.UTF-8 UTF-8
+ru_RU.UTF-8 UTF-8
\ No newline at end of file

diff --git a/data/lang/locale/spanish b/data/lang/locale/spanish
new file mode 100644 (file)
index 0000000..e7572be
--- /dev/null
+++ b/data/lang/locale/spanish
@@ -0,0 +1,2 @@
+en_US.UTF-8 UTF-8
+es_ES.UTF-8 UTF-8
\ No newline at end of file

diff --git a/lang/xorg.sh b/lang/xorg.sh
index b5bb222..7ce5d64 100755 (executable)
--- a/lang/xorg.sh
+++ b/lang/xorg.sh
@@ -8,4 +8,7 @@ NEWKEYMAP=$(head -1 /root/instantARCH/data/lang/keyboard/$KEYLANG)
 echo "setting keymap to $NEWXORG"
 
 localectl --no-convert set-x11-keymap "$NEWXORG"
-localectl --no-convert set-keymap "$NEWKEYMAP"
+
+if grep -q .. <<<"$NEWKEYMAP"; then
+    localectl --no-convert set-keymap "$NEWKEYMAP"
+fi