From 6920d8a676e779cc27bc7d171fc3290bd8da0a7b Mon Sep 17 00:00:00 2001
From: kprkpr <kevin01010@gmail.com>
Date: Tue, 31 May 2016 21:59:36 +0200
Subject: [PATCH] changes

---
 archinstall/chrootinstall.sh | 34 +++++++++++++++++++++++-----------
 1 file changed, 23 insertions(+), 11 deletions(-)

diff --git a/archinstall/chrootinstall.sh b/archinstall/chrootinstall.sh
index ccd55c9..9b84775 100755
--- a/archinstall/chrootinstall.sh
+++ b/archinstall/chrootinstall.sh
@@ -222,6 +222,17 @@ systemctl enable lightdm
 systemctl enable NetworkManager
 }
 
+function idiomax11 {
+echo "KEYMAP=$langabr" > /etc/vconsole.conf
+echo "# Read and parsed by systemd-localed. It's probably wise not to edit this file" > /etc/X11/xorg.conf.d/00-keyboard.conf
+echo "# manually too freely." >> /etc/X11/xorg.conf.d/00-keyboard.conf
+echo 'Section "InputClass"' >> /etc/X11/xorg.conf.d/00-keyboard.conf
+echo '    Identifier "system-keyboard"' >> /etc/X11/xorg.conf.d/00-keyboard.conf
+echo '    MatchIsKeyboard "on"' >> /etc/X11/xorg.conf.d/00-keyboard.conf
+echo '    Option "XkbLayout" "'$langabr'"' >> /etc/X11/xorg.conf.d/00-keyboard.conf
+echo 'EndSection' >> /etc/X11/xorg.conf.d/00-keyboard.conf
+}
+
 function entorno {
 clear
 optentorno=`dialog --stdout --nocancel --menu "Escoje tu entorno de escritorio" 0 0 5 1 "LXDE (Muy liviano)" 2 "XFCE (Liviano y bonito)" 3 "Cinnamon (Facil para antiguos usuarios de Windows)" 4 "Gnome (Complejo, pero practico)" 5 "Plasma/KDE (Pesado aunque bonito) " 6 "No instalar nada, solo la terminal de comandos"`
@@ -267,14 +278,7 @@ esac
 if [[ $instentorno ]];then
 graficos
 #Poner el teclado bien en x11
-echo "# Read and parsed by systemd-localed. It's probably wise not to edit this file" > /etc/X11/xorg.conf.d/00-keyboard.conf
-echo "# manually too freely." >> /etc/X11/xorg.conf.d/00-keyboard.conf
-echo 'Section "InputClass"' >> /etc/X11/xorg.conf.d/00-keyboard.conf
-echo '    Identifier "system-keyboard"' >> /etc/X11/xorg.conf.d/00-keyboard.conf
-echo '    MatchIsKeyboard "on"' >> /etc/X11/xorg.conf.d/00-keyboard.conf
-echo '    Option "XkbLayout" "'$langabr'"' >> /etc/X11/xorg.conf.d/00-keyboard.conf
-echo 'EndSection' >> /etc/X11/xorg.conf.d/00-keyboard.conf
-
+idiomax11
 #Aqui va la personalizacion de programas, ya que son graficos.
 programasguiuser
 fi
@@ -291,7 +295,7 @@ esac
 function otrasconfig {
 mostrardialog "Otras configuraciones" "Aquí puedes seleccionar otras configuraciones que puedes hacer a Arch antes de terminar la instalacion, como su nombre"
 
-othopt=`dialog --stdout --checklist "Otras configuraciones" 0 0 8 1 "Cambiar hostname (Nombre pc)" off`
+othopt=`dialog --stdout --checklist "Otras configuraciones" 0 0 8 1 "Cambiar hostname (Nombre pc)" off 2 "Usar otra distribucion de teclado como principal" off`
 
 case $othopt in
 	*1*)
@@ -300,8 +304,16 @@ case $othopt in
 		echo $nam > /etc/hostname
 		;;&
 	*2*) 
-		echo "none";;&
-	*3*)
+		echo "Escoja su idioma para la distribucion del teclado"
+		options=($(cat /etc/locale.gen | grep '^#[a-zA-Z]' | cut -c2-30 | cut -f1 -d"_" | sort | uniq))
+		select opt in "${options[@]}"
+		do
+			case $opt in
+				*) langabr=$opt;break;;
+			esac
+		done
+		idiomax11
+		;;&
 esac
 }